Merge pull request #930 from beN39sGroup/master