Merge https://github.com/idarraga/TPX3JUI