#55
fixes and closes #59