GPL
Merge pull request #26 from andrewjpage/master

GPL