Production release for #311 and #376

* #311 
* #376