Fixed #2
Merge pull request #8 from Acquisto/development

Fixed #2