Merge pull request #137 from isflorin/master

Update
Update
Merge pull request #138 from isflorin/dev

Dev