Fixes the intial commit. Fixes tests.
Merge pull request #7 from nickschuch/initial-commit

Fixes the intial commit. Fixes tests.