begin develop branch
solved #1
Merge branch 'iss1' into develop
Merge branch 'develop'