Removed commented code
GPL License added
Merge branch 'dev'