32-06
Merge branch 'master' of https://github.com/stden/loiro_xp
32-06