Fixed up with RVR and CAVOK
Merge pull request #7 from nickefimov/renaming

Fixed up with RVR and CAVOK