Update/add pieterv libs
Merge branch 'pieterv-libs'