Fix Bugfix of issue #141
Merge branch 'bugfix/141' into develop