make some tests green
Merge branch 'master' of github.com:Araq/Nimrod