Merge pull request #387 from Laser9un/master