Closes #7.
Merge pull request #8 from yetty/master

Closes #7.