corrections bugs FS #4928 #5203
Merge branch 'master' of https://github.com/swanand09/aboweb