try to respect 80-character limit
Merge branch '5-pkg-name' into 4-autocommit