Issue #81
Merge branch '4.1.0'