Added gdefine; Added test for #1
Merge branch 'master' of github.com:daxxog/bearded-octo-robot