Closes #37 #19