Jcg final

Get me back to master please! I just merged the master branch into my branch and everything should be perfect.