Update README and fix #7