Fix for my buddys
Merge branch 'develop' of https://github.com/olim7t/xpua3 into develop