added defaults
Merge branch 'dev' of https://github.com/code-iai/asimov into dev