Merge pull request #1221 from Cye3s/master