Update to pull from mrgreen3 github