Make minor modifications and add documentation #20