Merge pull request #755 from IBNobody/master