1. bug fixes
Merge branch 'master' of https://github.com/justinchen19791203/DFI.git