Issue 67
Merge branch '4.1.0'