Now inserts correct client information
Merge branch 'master' of github.com:Castcloud/Castcloud