Merge pull request #41 from noxsicarius/master

CleanUp & Fixes
Update README.md
Merge pull request #7 from gregariousjb/master

Update my fork