Update for 4.1
Merge pull request #1 from thujohn/patch-1

Update for 4.1