v.0.7

Perfomance improvements and bugfixes