Some text changes
Merge branch 'master' of github.com:QSD/tardis