Some minor changes on README.md and also on the code.