Passing all tests again. Fixes #4.