Merge pull request #753 from platschi/master