Merge pull request #121 from isflorin/master

Dev