Fixed #26
Fixed #23
Merge pull request #28 from Acquisto/fixed

Fixed