Fixes, Release 0.0.58