Extracted tuple generator to separate .scala file, Tpl<P1>, Tpl#add
Merge remote-tracking branch 'origin/tbsgame' into tbsgame