fix for issue #47
Merge remote-tracking branch 'upstream/master'