Fix issue #34 with PR #35
Merge remote-tracking branch 'upstream/master'