More work on Rhino
Merge pull request #28 from sradomski/master

More work on Rhino