Replaced brace initialization with std::pair constructor for OSX compatibility - closes #2