Merge branch 'master' into dev
Merge pull request #130 from isflorin/dev

Merge branch 'master' into dev