Merge pull request #21 from dapanas/master

Resolves #2