Closes #364