fix #8: Issue8 - Fix the typos and legacy codes
Merge pull request #9 from snowmantw/issue8

fix #8: Issue8 - Fix the typos and legacy codes