solved #1
Merge branch 'iss1' into develop