Merging PR  #79