Merge pull request #47 from CapCis/master

12.27.14 11:42
Update #121
Merge pull request #50 from CapCis/MELCAPCIS

Melcapcis