Issue#80

this merge request works pretty well in most forms . You will tell me if that's exactly what you wanted or if it can be improved !