Merge branch 'develop'
add quickstart test
Merge branch 'master' into develop