Update
Merge pull request #141 from isflorin/dev

Update