Added Guard support

This really improves development stage.
Merge pull request #103 from ainformatico/guard-support

Added Guard support