0.2.0: API change - please make sure you update everything
0.2.0: fixes, tests passing