0.49 release
fix issues/188
Merge remote-tracking branch 'upstream/0.49' into 0.49