removed debug messages, fixed substate watiting
Merge branch 'master' of github.com:downloadam/client