Merge pull request #2 from atomictissue/master

merge upstream
fix reds eyes
attempting to fix a merge conflitct
Merge pull request #3 from atomictissue/master

merge upstream
same ness
Merge pull request #2 from mralext20/master

fix reds eyes