Lastest version
Some little fixes