Issue 002
Merge pull request #4 from kakoplay/master

Issue 002