Merge pull request #154 from mhaskel/1.0.0-prep