Release for #297

Release for #297  (also includes #301)