Resolves issue #28
Merge pull request #30 from dohomi/master

Resolves issue #28