Merge pull request #581 from robinelfrink/master