Merge branch 'communication-branch'
Merge branch 'master' of https://github.com/jwcarr/Infinity