fix issue#6
Merge branch 'fix#6' into develop