Merge PoolBoy 1.3