Merge pull request #75 from finian/master

Client bug fixing and improve