Issue #70
Merge branch '4.1.0'