Merge pull request #15 from boostorg/develop

Develop
Merge pull request #17 from boostorg/master

Merge pull request #15 from boostorg/develop