Updated to more accurately reflect master branch