Updated license
Added Solutions tag
Merge branch 'master' into develop