Merge pull request #10 from adoankim/master

Merge issue-3 branch to master
Merge pull request #11 from adoankim/issue-3/improveUX

Merge pull request #10 from adoankim/master