Merge pull request #1 from beenlee/1.0

1.0
Merge pull request #2 from beenlee/master

Merge pull request #1 from beenlee/1.0