rewriting code lost in overwrite
accidentally overwrote stuff

Merge branch 'master' of https://github.com/awilby/vorticella-ptv