GPL
Merge pull request #51 from andrewjpage/master

GPL