Uw merge prs

PRs #51, #52, #53, #54 and #55 combined.