Getting started working again, adding in versioning
Merge branch '2.0' into 2.1