included extra description info
Merge branch 'per-directory-history' into elive