Merge branch 'develop'
update license header
Merge branch 'master' into develop