Merge pull request #1 from SuperDomX/master

Merge with Master Repo
Merge pull request #4 from xopherdeep/master

Merge pull request #1 from SuperDomX/master
Tested Pull