Update #24
Merge branch 'master' of https://github.com/CapCis/CAPCISbeta