Merge pull request #1060 from thess/pianod-work