guardian first
Merge pull request #139 from lipki/guardian_#52_#53

guardian first