Code

Merge branch 'jn/fix-abbrev'