Merge pull request #8 from niravpatel2008/nirav

Stamp
Admin issues fixed