Fixed
Merge pull request #52 from isflorin/dev

Fixed