Removing debug code
Merge pull request #108 from Dapid/fix_xxx

Removing debug code
update cpp file
Merge pull request #109 from piti118/master

update cpp file