Last touches closing #49.