Merge pull request #15 from shiaho/master

Fix admin error