Closes #84, #85