Issue #49
Merge branch '4.1.0'