1.0.1 prep
Merge pull request #40 from mhaskel/1.0.1-prep

1.0.1 prep