Merge pull request #584 from kwaaak/master