Merge pull request #512 from Chris-playground/511