synced to ed to commit 29000
Merge branch 'master' of https://github.com/ruler501/acr