this fixes #178 (need confirmation)
Merge remote-tracking branch 'upstream/master'