update to Dani's source
Merge branch 'master' of https://github.com/zsiki/ulyxes