outcommented useless test code
removed debug code
Merge branch 'origin/master'