Fixed small bugs...
Merge branch 'master' of github.com:conchrist/dogma