addresses #1 #47

Closed canwaf closed 3 years ago