Merge pull request #117 from cbare/develop

More docs updates