tag #65 pending
merge #65 #69
thanks