- fixes #103
Merge remote-tracking branch 'origin/issue#103' into issue#103