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