A few small changes
Merge branch 'master' of github.com:ANL-CESAR/SimpleMOC