fixed #258, try now
Merge remote-tracking branch 'upstream/master'