added new feature on new branch
Merge branch 'new_feature' of git://github.com/Simon245/grasshopper_sample into Simon245-new_feature

Fixed conflicts from Simon's request