Merge pull request #135 from isflorin/master

Update
Update
Merge pull request #136 from isflorin/dev

Dev