Merge pull request #9 from geodynamics/master

Merge pull request #8 from geodynamics/QA
Merge pull request #10 from geodynamics/devel

Merge pull request #9 from geodynamics/master