updated readme for 2.1.0
merging, fixing conflicts
fixed valgrind issues, memory leaks