Updated
Merge pull request #63 from isflorin/dev

Updated