Merge pull request #18 from mlocati/master

Add territory info
Fix apigen