Some small changes to @kezz101's Libraries API
Merge remote-tracking branch 'origin/master'