Closed myapnea/www_myapnea_org#90 and closed myapnea/www_myapnea_org#87