Fixed #30
Merge pull request #36 from Acquisto/fixed

Fixed #30