v1.0
Merge pull request #2 from cfb95/master

v1.0