Updated license to GPL version 3
Merge branch 'origin/master'