Fixed issues described in #111.
Merge branch 'master' of https://github.com/poweradmin/poweradmin