merge code
Merge branch 'master' of https://github.com/OrsonHsueh/ASJ
Merge branch 'master' of https://github.com/OrsonHsueh/ASJ