GPL
Merge pull request #28 from andrewjpage/master

GPL