Merge pull request #42 from paul-esch/master

condensed rewrite chapter 6.2 Versioning