Issue #69
Merge branch '4.1.0'