merged #811 against devel
merged #823 against devel
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel