Merge pull request #1 from nonhermitian/mcsolver_updates

Mcsolver updates