implemented issue #181
Merge branch 'release/2.0.3' into develop