Merge remote-tracking branch 'cyoung/master'

LICENSE

@@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the Joseph D Poirier nor the
+    * Neither the name of the Christopher Young nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.