Merge pull request #383 from Laser9un/master