Merge pull request #1 from nonhermitian/mcsolver_updates

Mcsolver updates
Merge pull request #2 from nonhermitian/master

Merge pull request #1 from nonhermitian/mcsolver_updates