fixes #433
Merge branch 'master' of github.com:Araq/Nimrod
fixes #420
fixes #439
fixes #432, fixes #427