Fixed issue #39
Merge pull request #40 from DanielCambray/fix-39

Fixed issue #39