merge
Merge branch 'master' of https://github.com/erictanweb/dfar
fix problems