james2m Merge pull request #72 from nard-tech/feature/refactor-dsl