Merge pull request #133 from isflorin/master

Merge