Closes #350