Merge pull request #2282 from cryode/bug/styleguide

Fix #2277, update Style Guide page.