Fixes for #107

Fixed #106 and updated docs.