Merge pull request #114 from TheSnoozer/master

Code Cleanup for issue #93, should fix #110 as well
Update README.md
Merge branch 'master', remote-tracking branch 'upstream/master'