GPL
Merge pull request #23 from andrewjpage/master

GPL