Fix ToString function
Update version