Merge pull request #1 from beenlee/1.0

1.0