Updated License to GPL 3.0
Merge pull request #1 from mattlag/master

Updated License to GPL 3.0
Merge pull request #2 from lukeb-uk/dev/trunk

Dev/trunk