Merge pull request #1 from ShadowStall/master

Merging Alex Branch with Master
Merge pull request #2 from ShadowStall/AlexBranch

Merge pull request #1 from ShadowStall/master