Closes  #77