fixes #544
fixes #531
Merge branch 'master' of github.com:Araq/Nimrod