Closed #74
Fixed missing titles
Closed #73
Fixed #75