Merge pull request #1033 from godFather89/master