v1.0
Merge pull request #3 from hrh235/master

v1.0