Merge pull request #1 from darkfox184/master

1325