made some tests green
Merge branch 'bigbreak' of https://github.com/Araq/Nimrod into bigbreak