Added tests
Fixed some wrong stuff.
Merged updated README