Fixed #24
Merge pull request #25 from Acquisto/fixed

Fixed #24