Closes #175, #177, #180