Merge pull request #27 from CapCis/master

12.20.14 12:27
Update #90
Merge pull request #29 from CapCis/MELCAPCIS

Melcapcis