Closes #155; Closes #146