Update copyright notice.
Fix test.
Add plural expression parser.