some changes
Merge branch 'master' of github.com:luca-penasa/vombat
fixed some bugs