Fixed up versioning to make things nice and tidy