Address bug 2187 and also made minor xml changes.
Merge branch 'master' of https://github.com/rptiwari/LaitsV3