Removed Unessecery Imports, Removes Multiple Errors.
Merge pull request #595 from Asajz/master

Error Fixes
Merge pull request #10 from Slowpoke101/master

Sync with upstream