issues #36 #37 #39 #27

Last version