Merge pull request #136 from isflorin/dev

Dev
Update
Merge pull request #137 from isflorin/master

Update