Merge pull request #3 from songyeep/master

pull request