remove debug print
fix param bug
Merge branch 'master' into RELEASE_20130723