Non-Condensable Gas-Water Waterhammer Analysis