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

Fixed #30