Documentation updates

This solves #3 and #6