fixed some closure related bugs
Merge branch 'master' of github.com:Araq/Nimrod