Update README, and merge #14