Updated licensing information, GPL 3.0
Merge branch 'working'