updated
prepared for 1.0.0