Closes #360