fix comparisons betwenn signed and unsigned integers
remove type specifiers from std::make_pair to make it c++11 compliant
Merge pull request #154.