fixed issue #2
Merge branch 'issue#2' into develop