Merge pull request #126 from isflorin/dev

Dev
Merge pull request #127 from isflorin/master

Merge pull request #126 from isflorin/dev