Closes  #103