Updated the master branch
I believe I have fixed the master branch