Merge pull request #1276 from Therzok/master