styling fix + version bump
Merge branch 'edge' into gh-pages