Merge pull request #3 from gyumin/develop

Close #1