Add support for intridea/grape
Merge branch 'supporting_grape'