Merge pull request #21 from CapCis/master

12.14.2014 11:24 Master to Matt
Merge pull request #23 from CapCis/MELCAPCIS

Merge pull request #21 from CapCis/master