First stage
Merge branch 'master' of https://github.com/Thronk/venus into client