updated framework
Merge branch 'v3quick' into develop
updated framework & sample