Improved reading of pac files - thx Massimo :)
Merge branch 'master' into build