fixed some bugs, added a testing file - updated the readme
merging
merged