A few more changes
Merge branch 'master' of github.com:evanwang22/DP2report
Final version..?