Issues closed #48 #54 #68