Changed API slightly. Improved tests.