Update to Adam's branch and update of README