Merge pull request #8 from sunnychow/master

4.0.0