Correct inconsistency between comments and functions or command line flag default values.
Merge pull request #6 from wangkuiyi/defects

Correct inconsistency between comments and functions or command line fla...
Merge pull request #8 from wangkuiyi/rm_debug

Remove debug/todo comments and shorten lines
Merge branch 'master' of https://github.com/wangkuiyi/prism