Updated version of catch.hpp