Updating to most recent original version

Cloned from original repo