Merge pull request #384 from Laser9un/master