Issue fixes 4 review

#34 #52