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