--- trunk/src/selection/SelectionCompiler.cpp	2012/08/22 02:28:28	1782
+++ trunk/src/selection/SelectionCompiler.cpp	2013/08/19 19:20:32	1931
@@ -35,7 +35,7 @@
  *                                                                      
  * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
  * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
- * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
  * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
  * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
@@ -119,12 +119,14 @@ namespace OpenMD {
 	//    ltoken.push_back(Token(Token::string, str));
 	//    continue;
 	//}
-	if (lookingAtDecimal((tokCommand & Token::negnums) != 0)) {
+	//if (lookingAtDecimal((tokCommand & Token::negnums) != 0)) {
+        if (lookingAtDecimal((tokCommand) != 0)) {
 	  float value = lexi_cast<float>(script.substr(ichToken, cchToken));        
 	  ltoken.push_back(Token(Token::decimal, boost::any(value)));
 	  continue;
 	}
-	if (lookingAtInteger((tokCommand & Token::negnums) != 0)) {
+	//if (lookingAtInteger((tokCommand & Token::negnums) != 0)) {
+        if (lookingAtInteger((tokCommand) != 0)) {
 
 	  int val = lexi_cast<int>(script.substr(ichToken, cchToken));
 	  ltoken.push_back(Token(Token::integer,   boost::any(val)));
@@ -177,7 +179,7 @@ namespace OpenMD {
 	continue;
       }
 
-      if (ltoken.size() == 0) {
+      if (ltoken.empty()) {
 	return commandExpected();
       }