fixes #1475
fixes #1434
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
fixes newly introduced bugs
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
fixes #1472