fixes #1672
fixes #1547
fixes #1657
doc improvements
fixes #1539
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel