Better naming convention
New example, fix cmdargs parsing bug
Fix merge conflict