Merge pull request #5 from Hwangss/master

Master