first commit
Merge https://github.com/r4jiv007/DFR