Merge pull request #1 from ShadowStall/master

Merging Alex Branch with Master