changes from Percy
Merge pull request #528 from willum070/percy

changes from Percy