pulling to joshuaMarple:master

making a pull so that I can make some modifications of my own. Will leave this one unchanged.