Merge pull request #9 from againcy/update

Update
Merge pull request #7 from againcy/master

merge master
little change
Merge pull request #10 from miketonson/master

little change