Added README and few bugs fix