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