Closes #319