Initial setup + tests
fix README.md merge conflict