collex/collex — pull request #2 by treydock (2013-10-02 18:48:26+00:00)
Title: Merge upstream

PR to make visible forked changes.