doc-update
Merge pull request #55 from fbergkemper/master

doc-update