Merge branch 'develop' resolve #3
Merge branch 'develop'
Merge branch 'develop' fix #4
bug fix
Merge branch 'hotfix/issue_5' fix #5
Merge branch 'master' into develop