fixes #332
fixes #304
Merge branch 'master' of github.com:Araq/Nimrod
added broken 'range' types to todo