1325

1325
Merge pull request #1 from darkfox184/master

1325
Revert "1325"
Merge pull request #2 from darkfox184/revert-1-master

Revert 1 master