Cleaned stuff up
Merged upstream
Merge pull request #1 from PsycodeDotOrg/master

Cleaned stuff up