fixed issues #175, #176
Merge branch 'release/2.0.3' into develop