Issues #77 #76 #73 #68 #56