Merge pull request #48 from 66Ton99/v1.4.x