fixing issue 41
 merge issue41 fixing