Merge branch 'master' into dev
add open source license
Merge branch 'dev'