0.1 is out - fixes 555

Fixes #555. Only merge after 0.1 is actually done!