Restoring stuff which mysteriously vanished
Merge branch 'master' of https://github.com/EtchUK/PubHack3