Closes #353 and closes #352