Merge pull request #453 from acro-pin/issues_449

Pull Request  Issues #449 after modification for client mode.