Release for #297 & #300

Release for #297 and #300   (also includes #301)