Release both

This I hope will resolve all 3 pull requests