Updated library versions
Merge branch 'master' into christian_uni