Resolves #19
Merge pull request #22 from joom/master

Resolves #19