Fix bad merge conflict from Ryan's previous PR
Merge pull request #107 from unl/kabel-four

Fix bad merge conflict from Ryan's previous PR