Merge pull request #3 from shankari/fix_air

Fix the mess with the air mode