fixes #1319
fixes #1144
fixes #1285
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel