Merge pull request #138 from isflorin/dev

Dev
Update
Merge pull request #139 from isflorin/master

Update