Fix phase 3
Merge branch 'master' of https://github.com/damienb/viruscircuit