deleted some unnecessary code in 1.8
merge conflicts
readme added
updated readme