Removed redundant class members, added --replace option - NOT IMPLEMENTED YET
merge with master
Fixed bad merge
Typo in comment
Merge pull request #2 from MarounMaroun/replace_support

Removed redundant class members, added --replace option