fixes #516
fixes #398
Merge branch 'master' of github.com:Araq/Nimrod