hotfixes
Merge branch 'master' of https://github.com/antoinerapy/uniiti.git