Merge branch 'development'
added license
Merge branch 'master' into development