small changes
Merge branch 'master' of https://github.com/txa/alex-new