beta2

Up-to date with original repo