Merge pull request #52 from ComputationalRadiationPhysics/merge-1.0b

Merge 1.0b