quick merge from my personal fork into the real nat-poker fork