fix bugs.
Merge branch 'master' of github.com:OrsonHsueh/ASJ