Mwasser docs2

replacement merge request for #7