diff --git a/.travis.yml b/.travis.yml
index 11ab0f5..24b1527 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,16 +11,22 @@ matrix:
     - php: 5.6
     - php: 7.0
     - php: 7.1
+    - php: 7.2
+    - php: hhvm
+      env: HHVM=true
 
 install:
   - composer install
+  - if [[ $HHVM == true ]]; then composer require "phpunit/phpunit:5.7"; fi
 
 before_script:
   - mkdir -p build/logs
   - cd tests
 
 script:
-  - phpunit --colors --coverage-clover ../build/logs/clover.xml .
+  - if [[ $HHVM == true ]]; then ../vendor/bin/phpunit --colors --coverage-clover ../build/logs/clover.xml .; fi
+  - if [[ $HHVM != true ]]; then phpunit --colors --coverage-clover ../build/logs/clover.xml .; fi
+
 
 after_success:
   - cd ..
diff --git a/LICENSE b/LICENSE
index 08533da..46c6d1c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014, 2015, 2016 Josh Sherman
+Copyright (c) 2014, 2015, 2016, 2017, 2018 Josh Sherman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/composer.json b/composer.json
index 4d1073e..9c35393 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,22 @@
 {
-    "name":        "joshtronic/php-loremipsum",
+    "name": "joshtronic/php-loremipsum",
     "description": "Lorem ipsum generator in PHP without dependencies",
-    "version":     "1.0.2",
-    "type":        "library",
-    "keywords":    ["lorem", "ipsum", "generator"],
-    "homepage":    "https://github.com/joshtronic/php-loremipsum",
-    "license":     "MIT",
-    "authors": [{
-        "name":     "Josh Sherman",
-        "email":    "josh@gravityblvd.com",
-        "homepage": "http://joshtronic.com"
-    }],
+    "version": "1.0.3",
+    "type": "library",
+    "keywords": [
+        "lorem",
+        "ipsum",
+        "generator"
+    ],
+    "homepage": "https://github.com/joshtronic/php-loremipsum",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Josh Sherman",
+            "email": "hello@joshtronic.com",
+            "homepage": "https://joshtronic.com"
+        }
+    ],
     "require": {
         "php": ">=5.3.0"
     },
@@ -18,6 +24,8 @@
         "satooshi/php-coveralls": "~1.0"
     },
     "autoload": {
-        "psr-4": {"joshtronic\\": "src/"}
+        "psr-4": {
+          "joshtronic\\": "src/"
+        }
     }
 }
diff --git a/src/LoremIpsum.php b/src/LoremIpsum.php
index 95164be..393c9b6 100644
--- a/src/LoremIpsum.php
+++ b/src/LoremIpsum.php
@@ -8,8 +8,8 @@
  * Licensed under The MIT License.
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
- * @copyright Copyright 2014, 2015, 2016 Josh Sherman
+ * @author    Josh Sherman <hello@joshtronic.com>
+ * @copyright Copyright 2014, 2015, 2016, 2017, 2018 Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
  * @link      https://github.com/joshtronic/php-loremipsum
  */
@@ -39,53 +39,37 @@ class LoremIpsum
      */
     public $words = array(
         // Lorem ipsum...
-        'lorem',        'ipsum',       'dolor',        'sit',
-        'amet',         'consectetur', 'adipiscing',   'elit',
-        // The rest of the vocabulary
-        'a',            'ac',          'accumsan',     'ad',
-        'aenean',       'aliquam',     'aliquet',      'ante',
-        'aptent',       'arcu',        'at',           'auctor',
-        'augue',        'bibendum',    'blandit',      'class',
-        'commodo',      'condimentum', 'congue',       'consequat',
-        'conubia',      'convallis',   'cras',         'cubilia',
-        'cum',          'curabitur',   'curae',        'cursus',
-        'dapibus',      'diam',        'dictum',       'dictumst',
-        'dignissim',    'dis',         'donec',        'dui',
-        'duis',         'egestas',     'eget',         'eleifend',
-        'elementum',    'enim',        'erat',         'eros',
-        'est',          'et',          'etiam',        'eu',
-        'euismod',      'facilisi',    'facilisis',    'fames',
-        'faucibus',     'felis',       'fermentum',    'feugiat',
-        'fringilla',    'fusce',       'gravida',      'habitant',
-        'habitasse',    'hac',         'hendrerit',    'himenaeos',
-        'iaculis',      'id',          'imperdiet',    'in',
-        'inceptos',     'integer',     'interdum',     'justo',
-        'lacinia',      'lacus',       'laoreet',      'lectus',
-        'leo',          'libero',      'ligula',       'litora',
-        'lobortis',     'luctus',      'maecenas',     'magna',
-        'magnis',       'malesuada',   'massa',        'mattis',
-        'mauris',       'metus',       'mi',           'molestie',
-        'mollis',       'montes',      'morbi',        'mus',
-        'nam',          'nascetur',    'natoque',      'nec',
-        'neque',        'netus',       'nibh',         'nisi',
-        'nisl',         'non',         'nostra',       'nulla',
-        'nullam',       'nunc',        'odio',         'orci',
-        'ornare',       'parturient',  'pellentesque', 'penatibus',
-        'per',          'pharetra',    'phasellus',    'placerat',
-        'platea',       'porta',       'porttitor',    'posuere',
-        'potenti',      'praesent',    'pretium',      'primis',
-        'proin',        'pulvinar',    'purus',        'quam',
-        'quis',         'quisque',     'rhoncus',      'ridiculus',
-        'risus',        'rutrum',      'sagittis',     'sapien',
-        'scelerisque',  'sed',         'sem',          'semper',
-        'senectus',     'sociis',      'sociosqu',     'sodales',
-        'sollicitudin', 'suscipit',    'suspendisse',  'taciti',
-        'tellus',       'tempor',      'tempus',       'tincidunt',
-        'torquent',     'tortor',      'tristique',    'turpis',
-        'ullamcorper',  'ultrices',    'ultricies',    'urna',
-        'ut',           'varius',      'vehicula',     'vel',
-        'velit',        'venenatis',   'vestibulum',   'vitae',
-        'vivamus',      'viverra',     'volutpat',     'vulputate',
+        'lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur', 'adipiscing', 'elit',
+
+        // and the rest of the vocabulary
+        'a', 'ac', 'accumsan', 'ad', 'aenean', 'aliquam', 'aliquet', 'ante',
+        'aptent', 'arcu', 'at', 'auctor', 'augue', 'bibendum', 'blandit',
+        'class', 'commodo', 'condimentum', 'congue', 'consequat', 'conubia',
+        'convallis', 'cras', 'cubilia', 'curabitur', 'curae', 'cursus',
+        'dapibus', 'diam', 'dictum', 'dictumst', 'dignissim', 'dis', 'donec',
+        'dui', 'duis', 'efficitur', 'egestas', 'eget', 'eleifend', 'elementum',
+        'enim', 'erat', 'eros', 'est', 'et', 'etiam', 'eu', 'euismod', 'ex',
+        'facilisi', 'facilisis', 'fames', 'faucibus', 'felis', 'fermentum',
+        'feugiat', 'finibus', 'fringilla', 'fusce', 'gravida', 'habitant',
+        'habitasse', 'hac', 'hendrerit', 'himenaeos', 'iaculis', 'id',
+        'imperdiet', 'in', 'inceptos', 'integer', 'interdum', 'justo',
+        'lacinia', 'lacus', 'laoreet', 'lectus', 'leo', 'libero', 'ligula',
+        'litora', 'lobortis', 'luctus', 'maecenas', 'magna', 'magnis',
+        'malesuada', 'massa', 'mattis', 'mauris', 'maximus', 'metus', 'mi',
+        'molestie', 'mollis', 'montes', 'morbi', 'mus', 'nam', 'nascetur',
+        'natoque', 'nec', 'neque', 'netus', 'nibh', 'nisi', 'nisl', 'non',
+        'nostra', 'nulla', 'nullam', 'nunc', 'odio', 'orci', 'ornare',
+        'parturient', 'pellentesque', 'penatibus', 'per', 'pharetra',
+        'phasellus', 'placerat', 'platea', 'porta', 'porttitor', 'posuere',
+        'potenti', 'praesent', 'pretium', 'primis', 'proin', 'pulvinar',
+        'purus', 'quam', 'quis', 'quisque', 'rhoncus', 'ridiculus', 'risus',
+        'rutrum', 'sagittis', 'sapien', 'scelerisque', 'sed', 'sem', 'semper',
+        'senectus', 'sociosqu', 'sodales', 'sollicitudin', 'suscipit',
+        'suspendisse', 'taciti', 'tellus', 'tempor', 'tempus', 'tincidunt',
+        'torquent', 'tortor', 'tristique', 'turpis', 'ullamcorper', 'ultrices',
+        'ultricies', 'urna', 'ut', 'varius', 'vehicula', 'vel', 'velit',
+        'venenatis', 'vestibulum', 'vitae', 'vivamus', 'viverra', 'volutpat',
+        'vulputate',
     );
 
     /**
diff --git a/tests/LoremIpsumTest.php b/tests/LoremIpsumTest.php
index 7b794cd..e568b4d 100644
--- a/tests/LoremIpsumTest.php
+++ b/tests/LoremIpsumTest.php
@@ -2,7 +2,10 @@
 
 require_once '../src/LoremIpsum.php';
 
-if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) {
+if (
+    !class_exists('\PHPUnit_Framework_TestCase')
+    && class_exists('\PHPUnit\Framework\TestCase')
+) {
     class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
 }
 
@@ -34,8 +37,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_array($words));
         $this->assertCount(3, $words);
 
-        foreach ($words as $word)
-        {
+        foreach ($words as $word) {
             $this->assertRegExp('/^[a-z]+$/i', $word);
         }
     }
@@ -61,8 +63,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_array($sentences));
         $this->assertCount(3, $sentences);
 
-        foreach ($sentences as $sentence)
-        {
+        foreach ($sentences as $sentence) {
             $this->assertRegExp('/^[a-z, ]+\.$/i', $sentence);
         }
     }
@@ -86,8 +87,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_array($paragraphs));
         $this->assertCount(3, $paragraphs);
 
-        foreach ($paragraphs as $paragraph)
-        {
+        foreach ($paragraphs as $paragraph) {
             $this->assertRegExp('/^([a-z, ]+\.)+$/i', $paragraph);
         }
     }
@@ -122,8 +122,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_array($words));
         $this->assertCount(3, $words);
 
-        foreach ($words as $word)
-        {
+        foreach ($words as $word) {
             $this->assertRegExp('/^<li>[a-z]+<\/li>$/i', $word);
         }
     }