closes #94 #97

Closed gianpieropa closed 2 years ago