Fix #43
Merge branch 'master' into 2.0.x