Preparing for client implementation
Merge branch 'master' of https://github.com/cnduru/sw7