Merge branch 'master' of https://github.com/biophysics/gpx into gh-pages