Closes #116, Closes #115