Closes  #44