Merge pull request #25 from mdcb-gmt/master

python-3 fixes