refactor, add tests, update readme.

Should now produce expected results on all tests.
can you fix the indentation to tabs?