Closed myapnea/www_myapnea_org#138. Worked on myapnea/www_myapnea_org#123