1.1.1 prep
Merge pull request #219 from mhaskel/1.1.1-prep

1.1.1 prep