Merge pull request #37 from lorinlee/1.0.0-rc02