Merge pull request #483 from webgeek1234/master