Final commit before app v1.0 release