Resolves issue #2
Merge pull request #4 from kwood/master

Resolves issue #2