Finished #107
Fixed #108