#1316 - /py country defaults to "andorra"
merge with the lastest master and fix merge conflicts