Adjusted Maps for solver and matrix generator
Merge pull request #198 from iMikePayne/master

Adjusted Maps for solver and matrix generator