simplifying citizen ids
on simplifying the citizen ids
Merge pull request #18 from msat-cont/master

simplified citizen alias ids