Patches for VS 2012
Remove the explicit template arguments for std::make_pair() call.
Merge pull request #230 from yangyanli/vs2012-patches

Patches for VS 2012