4.1.0 prep
Merge pull request #229 from mhaskel/4.1.0-prep

4.1.0 prep