Closes #265
Closes #266