Improving Version String
Merge branch 'master' into cooking