fix issue #1
Merge branch 'hotfix_issue_1'
fix cpu utilization problem
Merge branch 'hotfix_issue_2'
Merge branch 'master' into refactor_v2