Merge pull request #4 from Clanat/master

[Pet] some fixes