Added smiles count
merge master with nikis_shit