Changes for bugs
Merge branch 'master' of https://github.com/shashin62/kvoadmin