Merge pull request #9 from willyxiao/master

manage working for users and other small fixes