Merge pull request #726 from shalzz/master