fixes #1562, fixes #1543
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel