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