merge #10 #45
thanks