Fixes #10 adn soem other chages to files before this bug.