Merge pull request #3 from thouveng/add-client-init

Add the client state to the init state