Implementation of replace/add methods, fixes to direct client interaction, misc touch ups.
Removing garbage
Removing empty space replacement, end user should responsible for this not the client
Merge pull request #3 from AlekseyKorzun/master-dev

Implementation of replace/add methods, fixes to direct client interaction, misc touch ups.