Merge pull request #3 from junki929/master

Master