Merge branch 'master'
note edited
Merge branch 'development'