Update for macro syntax changes
Bump version
Merge branch 'master' into gh-pages
Update docs