Closes #83, #100