Merge pull request #121 from isflorin/master

Dev
Merge pull request #122 from isflorin/dev

Merge pull request #121 from isflorin/master