Pull request for Settings feature