Corrected 24 and 25.
Merge branch 'master' of https://github.com/gsvgit/142_13_1
Corrected 24 & 25