Small change to main.cpp. Ready to merge