Doc update
Merge pull request #193 from sbillard/master

Doc update