Stop ClientInfo being static.
Merge pull request #176 from greboid/master

Stop ClientInfo being static.