Merge pull request #558 from mkorkalo/master