Merge pull request #566 from sarbbottam/chore