Merge pull request #1 from SweenEy1130/master

11_29
Merge pull request #2 from Determ/master

Merge pull request #1 from SweenEy1130/master