Updated to the latest source code on the original repo