Updated dev
Merge pull request #1 from isflorin/dev

Updated dev