Merge pull request #142 from isflorin/master

asd
Update
Merge pull request #143 from isflorin/dev

Dev