This closes #2 and resolves the problem.

Signed-off-by: David Robinson <david@redevolution.com>