Fixes Issue #15
Merge pull request #17 from smoitra87/master

Fixes Issue #15