fixed display error
Merge branch 'master' of https://github.com/d-fan/ComputeFest2014
renamed functions