Revert "Removed Guard, because it is broken #322"

This reverts commit 0a4632cadedd6145a5f5cdd0941b22874c0ef974.

Conflicts:
	Gemfile.lock