Cleanup DSL
Fix specs
Merge branch 'master' into cleanup
Merge pull request #20 from scienceexchange/cleanup

Cleanup