Last version
last version with a new jar and fixing some bugs