1.0.4 prep
Merge pull request #42 from mhaskel/1.0.4-prep

1.0.4 prep