Fix Rhino support
Merge pull request #462 from broady/master

Fix support for Rhino