- fixes and improvements for ChgMatrix Phase II
Merge pull request #28 from afabiani/master

 - fixes and improvements for ChgMatrix Phase II