Issue #61
Merge branch '4.1.0'