fixing issue #56
FIxing issue #56 and #80
tests all green