Final Commit v1.0.0