Updated to support newer guard API
Merge pull request #3 from raldred/patch-1

Updated to support newer guard API