I'm so tired of 4 stage commits.
Merge pull request #21 from VertiPub/againwb401-10.0

I'm so tired of 4 stage commits.