Merge pull request #2 from GrokInteractive/jellis

Jellis
Merge branch 'develop' into jellis