Merge pull request #184 from DOCGroup/random-minor-changes