Updates for issue #58 #57