Merge pull request #55 from jeet23/master

admin working