Fixed #127
Merge remote-tracking branch 'upstream/master'