Updated patterns. Fixed handling of C-style comments.