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

More work on Rhino datamodel