v1.0
Merge pull request #4 from wpexia/dev

v1.0