full run with modification
adding missing ones
code clean up
including more small changes
re-organized file and folders
Merge branch 'develop'