Completed all features for 1.0.0