Fixed Issue #9
Merge pull request #17 from esparrs/master

Fixed Issue #9