Improvement of issue #7 fix
Merge remote-tracking branch 'origin/master'