Add vertex options
Merge branch 'enhancement-#36' into develop
Fix generated JS