added license
Merge branch 'master-0.5' into develop