More of a dsl/builder style. Fixed unit tests accordingly
Merge branch 'master' of https://github.com/warebot/golasto