Fixed #31
Merge pull request #35 from Acquisto/fixed

Fixed #31