fixes #503
fixes #505
Merge branch 'master' of github.com:Araq/Nimrod