Fix for #15
Merge pull request #24 from dsully/master

Fix for #15