Merge pull request #956 from oliverds/master

Several enhancements.