Closes #352