Merge pull request #133 from isflorin/master

Merge
Merge pull request #134 from isflorin/dev

Merge pull request #133 from isflorin/master