Fixes 24. v0.10.7 and added test