work on issue #89
Merge remote-tracking branch 'upstream/master'