release-0.5 to develop

getting the final touches from release-0.5 back to develop