Edit properties
Merge branch 'v2' into gh-pages