Revert "Final changes before review for post-Rapperswil mailing"
Merge pull request #19 from cplusplus/revert-18-master

Revert "Final changes before review for post-Rapperswil mailing"