GPL 2
Merge pull request #14 from andrewjpage/master

GPL