Improve the abbreviations handler
Improve the Travis-CI configuration