Add tests, modify README
README modification
incorporate updateFrom branch