updated for version 1.1.9
added some abbreviations