Merge pull request #1 from raymond-h/master

Globs and stuff
Updated package version for raymond-h's PR
Merge remote-tracking branch 'upstream/master'