Basic support of #1, #2, #5
Merge branch 'master' of https://github.com/IQSS/Zelig5Choice