Merge pull request #35 from CapCis/master

Merge pull request #33 from CapCis/MELCAPCIS
Update #96
Merge pull request #39 from CapCis/MELCAPCIS

Melcapcis