gpl 2
Merge pull request #81 from andrewjpage/master

GPL