Merge pull request #1 from Moobin/master

Sync 0.1.1
Merge pull request #2 from joelalejandro/master

Sync website