Upgraded pattern matching; changed icon.