Bug fixes and improvements
Merge branch 'master' of https://github.com/openplanets/roda