fix issues/188
Merge branch '0.49' into 0.50