restore v2.5 and edit
Merge branch 'master' of github.com:kikjs75/codingeverybody