Guard 2 compatibility
Merge remote-tracking branch 'upstream/master' into guard-2-compat
Merge pull request #2 from thejchap/guard-2-compat

Guard 2 compatibility