Closed myapnea/www_myapnea_org#93 and Closed myapnea/www_myapnea_org#106