Merge pull request #9 from simon-kim/master

Pulling