Merge pull request #10 from adoankim/master

Merge issue-3 branch to master