Possibly not working
Merge branch 'master' into working

master branch not working the way it should.