Merge pull request #1 from CppCon/master

Merge from master