Merge pull request #126 from isflorin/dev

Dev