Merge pull request #20 from gabriele-v/master

Fix strings for translations
Update util.cpp