Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'release/0.0.4'
Merge branch 'release/0.0.5'
adding vendor support