closes #96 #113

Closed gianpieropa closed 2 years ago