Merge pull request #33 from glynos/master

New changes based on updates to last WG21 proposal
Formatting fixes according to Google style guidelines.