clear up
Merge pull request #48 from martinstaniforth/client_changes

clear up