Merge Mike Warren's edits and additions
Bump version