--- trunk/src/selection/TokenMap.cpp	2010/03/22 18:45:39	1412
+++ branches/development/src/selection/TokenMap.cpp	2011/09/14 21:15:17	1629
@@ -69,7 +69,7 @@ namespace OpenMD {
     tokenMap_.insert(TokenMapType::value_type("<", Token(Token::opLT, std::string("<"))));
     tokenMap_.insert(TokenMapType::value_type("<=", Token(Token::opLE, std::string("<="))));
     tokenMap_.insert(TokenMapType::value_type(">=", Token(Token::opGE, std::string(">="))));
-    tokenMap_.insert(TokenMapType::value_type(">", Token(Token::opGT, std::string(">="))));
+    tokenMap_.insert(TokenMapType::value_type(">", Token(Token::opGT, std::string(">"))));
     tokenMap_.insert(TokenMapType::value_type("==", Token(Token::opEQ, std::string("=="))));
     tokenMap_.insert(TokenMapType::value_type("!=", Token(Token::opNE, std::string("!="))));
     tokenMap_.insert(TokenMapType::value_type("within", Token(Token::within, std::string("within"))));
@@ -80,6 +80,7 @@ namespace OpenMD {
     tokenMap_.insert(TokenMapType::value_type("x", Token(Token::x, std::string("x"))));
     tokenMap_.insert(TokenMapType::value_type("y", Token(Token::y, std::string("y"))));
     tokenMap_.insert(TokenMapType::value_type("z", Token(Token::z, std::string("z"))));
+    tokenMap_.insert(TokenMapType::value_type("r", Token(Token::r, std::string("r"))));
     tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to"))));
     
     tokenMap_.insert(TokenMapType::value_type("all", Token(Token::all, std::string("all"))));