Closes #283
Closes #266