Merge pull request #436 from YaroSpace/Guard

Guard integration