Merge pull request #868 from mariokmk/master