clFinish to wait for execution
Merge branch 'hotfix/0.0.1a4'