v1.0
Merge pull request #2 from wankee/develop

v1.0