Headers teporarily removed, will re-add. Cleanup phase 1
Repeating function line removed from output. Cleanup phase 2
Shortened code: removed temp variables  (Headers till missing. will add soon)
Shortened code: removed temp variables  (Headers till missing. will add soon). Push 2 as Push 1 failed.
Merge branch 'master' of https://github.com/puconghan/plt