Merge pull request #63 from letsget23/master

merge
Merge pull request #64 from letsget23/gwan

Merge pull request #63 from letsget23/master