Update Dev 0.0.10

Bugfixes and some tests