Merge branch 'hotfix/chg_files'
Merge branch 'develop'
Merge branch 'develop'
fix typo
Merge pull request #3 from mugenen/release

fix typo
Merge branch 'master' into develop