Merge pull request #12 from geodynamics/master

merge Master into Devel
Merge pull request #13 from geodynamics/devel

Merge pull request #12 from geodynamics/master