some minor bugfixes
Merge branch 'master' of https://github.com/dwerner/dorm