Closes #354