Closes #342