Fixed #15
Merge pull request #16 from Acquisto/fixed

Fixed #15