Merge pull request eleme#27 from JeasonWong/master 1.0.15
Merge pull request eleme#17 from JeasonWong/master 1.0.14