Release improvements 536

Fixes #536