Added the dynamic configuration
Added code comments and cleaning coding
Remove old data file
Merge branch 'develop'