Merge pull request #12 from geodynamics/master

merge Master into Devel