Miscellaneous fixes and improvements
Merge pull request #10 from ahojnnes/orb

Miscellaneous fixes and improvements