jimbojw/corridor — pull request #32 by jimbojw (2013-09-04 04:21:19+00:00)
Title: Bugfix/merge mismatch

Fixes #27