fixes #1420
fixes #1380
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel