diff --git a/src/AttributedString.php b/src/AttributedString.php
index e6256af..c63704a 100644
--- a/src/AttributedString.php
+++ b/src/AttributedString.php
@@ -3,7 +3,7 @@
 
 /**
  * Basic class to work with attributed strings.
- * 
+ *
  * Attributed strings are strings that can have multiple attributes per character of the string
  *
  * @author Adrian Pemsel <apemsel@gmail.com>
diff --git a/src/MutableAttributedString.php b/src/MutableAttributedString.php
index 93927f8..f3c6b74 100644
--- a/src/MutableAttributedString.php
+++ b/src/MutableAttributedString.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace apemsel\AttributedString;
 
 /**
diff --git a/src/TokenizedAttributedString.php b/src/TokenizedAttributedString.php
index 418ca5a..1576bde 100644
--- a/src/TokenizedAttributedString.php
+++ b/src/TokenizedAttributedString.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace apemsel\AttributedString;
 
 /**
@@ -46,11 +45,20 @@ public function getTokens() {
   /**
    * Return all tokens' offsets
    *
-   * @return in[] offsets
+   * @return int[] offsets
    */
   public function getTokenOffsets() {
     return $this->tokenOffsets;
   }
+  
+  /**
+   * Return the number of tokens
+   *
+   * @return int count
+   */
+  public function getTokenCount() {
+    return count($this->tokens);
+  }
 
   /**
    * Get indicated token
@@ -127,7 +135,7 @@ public function attributesAtToken($i) {
     return $this->attributesAt($this->tokenOffsets[$i]);
   }
   
-  /*
+  /**
    * Convert all tokens to lower case
    */
   public function lowercaseTokens() {
@@ -136,17 +144,36 @@ public function lowercaseTokens() {
     }, $this->tokens);
   }
   
-  protected static function tokenizeOnWhitespace($string) {
+  /**
+   * Tokenize a string on whitespace
+   *
+   * @param string $string string to be tokenized
+   * @return string[] tokens
+   */
+  public static function tokenizeOnWhitespace($string) {
     // Matches pontential whitespace in front of the token and the token itself.
     // Matching the whitespace could be omitted, but that results in slower execution ;-)
     return self::tokenizeOnRegex($string, '/[\s\n\r]*([^\s\n\r]+)/u');
   }
   
-  protected static function tokenizeOnWords($string) {
+  /**
+   * Tokenize a string on words
+   *
+   * @param string $string string to be tokenized
+   * @return string[] tokens
+   */
+  public static function tokenizeOnWords($string) {
     return self::tokenizeOnRegex($string, '/([\w]+)/u');
   }
   
-  protected static function tokenizeOnRegex($string, $pattern)
+  /**
+   * Tokenize a string with a given regex
+   *
+   * @param string $string string to be tokenized
+   * @param string $pattern regex. The token must be captured in the first subgroup.
+   * @return string[] tokens
+   */
+  public static function tokenizeOnRegex($string, $pattern)
   {
     // Fastest way to get both tokens and their offsets, but not easy to understand.
     preg_match_all($pattern, $string, $matches, PREG_OFFSET_CAPTURE);