Revert "Revert "FIX: Fixes #41..."  -- One day I'll learn Git real good.

This reverts commit 4b8ca65e00909eb958a9faa0b66909f2584a1245.