@@ -22,7 +22,7 @@
 
 public class CaseHelper {
 
-	private static final Pattern pattern = Pattern.compile("([A-Z]|[a-z])[a-z]*");
+	private static final Pattern pattern = Pattern.compile("([A-Z]|[a-z])[a-z0-9]*");
 
 	public static String camelCaseToSnakeCase(String camelCase) {
 
@@ -61,14 +61,15 @@ public static String camelCaseToUpperSnakeCase(String camelCase) {
 	}
 
 	public static String lowerCaseFirst(String string) {
-		if (string.length() < 2)
+		if (string.length() < 2) {
 			return string.toLowerCase();
+		}
 		String first = string.substring(0, 1).toLowerCase();
 		String end = string.substring(1, string.length());
 		return first + end;
-    }
+	}
 
-    public static String camelCaseToUpperSnakeCase(String prefix, String camelCase, String suffix) {
+	public static String camelCaseToUpperSnakeCase(String prefix, String camelCase, String suffix) {
 		if (prefix != null && !camelCase.startsWith(prefix)) {
 			camelCase = prefix + "_" + camelCase;
 		}
 
@@ -15,8 +15,7 @@
  */
 package org.androidannotations.helper;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class CaseHelperTest {
@@ -31,6 +30,7 @@ public void testCamelCaseToUpperSnakeCaseString() throws Exception {
 	@Test
 	public void testCamelCaseToUpperSnakeCaseStringStringString() throws Exception {
 		Assert.assertEquals("CAMEL_CASE", CaseHelper.camelCaseToUpperSnakeCase(null, "camelCase", null));
+		Assert.assertEquals("CAMEL2_CASE", CaseHelper.camelCaseToUpperSnakeCase(null, "camel2Case", null));
 		Assert.assertEquals("PREFIX_CAMEL_CASE", CaseHelper.camelCaseToUpperSnakeCase("prefix", "camelCase", null));
 		Assert.assertEquals("PREFIX_CAMEL_CASE", CaseHelper.camelCaseToUpperSnakeCase("prefix", "prefixCamelCase", null));
 		Assert.assertEquals("CAMEL_CASE_SUFFIX", CaseHelper.camelCaseToUpperSnakeCase(null, "camelCase", "suffix"));