updated for 1.0
Merge pull request #2 from hayes/master

updated for 1.0