Merge pull request #14 from Lightmatter/master

Master
grep for the actual project name
should probably have parens
Merge branch 'develop'