1) merge Louis
Merge branch 'master' of https://github.com/OrsonHsueh/ASJ