Merge pull request #1 from rtomac/master

Merge to V1.5.0