Closes #177
Closes #178