fixes #1366
fixes #1067
fixes #1444
Merge branch 'bigbreak' of https://github.com/Araq/Nimrod into bigbreak