Merge pull request #532 from davidgfnet/master