Closed myapnea/www_myapnea_org#95. Worked on myapnea/www_myapnea_org#58