Merge pull request #17 from jinxcat/master

finishing up admin api