Closes #254
Closes #255