guard/guard — pull request #654 by e2 (2014-10-31 18:19:39+00:00)
Title: Refactor

each commit should be self-explanatory