Update #20
Update #21
Update #22
Merge branch 'master' of https://github.com/CapCis/CAPCIS