Merge pull request #9 from niravpatel2008/nirav

Admin issues fixed