Include ../lib [again]
Merge branch 'pr/include_lib'