Closes #283
Closes #284