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