bug fixes resolve #43 and #29