Merge with issue#2
Only code of develop
Merge branch 'master' into develop