Updated documentation, fixes #7 and #8