--- trunk/src/selection/TokenMap.cpp	2009/11/25 20:02:06	1390
+++ trunk/src/selection/TokenMap.cpp	2010/10/19 18:40:54	1513
@@ -76,9 +76,11 @@ namespace OpenMD {
     tokenMap_.insert(TokenMapType::value_type(".", Token(Token::dot, std::string("."))));
     tokenMap_.insert(TokenMapType::value_type("mass", Token(Token::mass, std::string("mass"))));
     tokenMap_.insert(TokenMapType::value_type("charge", Token(Token::charge, std::string("charge"))));
+    tokenMap_.insert(TokenMapType::value_type("hull", Token(Token::hull, std::string("hull"))));
     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::z, 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"))));