Merge pull request #17 from mdcb-gmt/master