diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..058ac04
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/) and http://keepachangelog.com/.
+
+## [Unreleased]
+### Added
+- CHANGELOG.md from @dash0002
+
+## [1.0.0]
+### Changed
+- Moved license content from python file to LICENSE
+- Updated README to reflect current state of project
+- Upgraded to support Python 3.4.3
+
+## [1.0.1]
+### Changed
+- Imported select functions only rather than the entire module.
+- remove unused variables.
+- Remove string slice and use a datetime function instead.
+- Now compatible with python 3.5.2
+- Added Contributor Dark-Passenger to Readme
+
+## [1.0.2]
+### Added
+- Added support for skip tests.
diff --git a/HTMLTestRunner.py b/HTMLTestRunner.py
index 8d60600..59f6680 100644
--- a/HTMLTestRunner.py
+++ b/HTMLTestRunner.py
@@ -1,110 +1,16 @@
-"""
-A TestRunner for use with the Python unit testing framework. It
-generates a HTML report to show the result at a glance.
-
-The simplest way to use this is to invoke its main method. E.g.
-
-    import unittest
-    import HTMLTestRunner
-
-    ... define your tests ...
-
-    if __name__ == '__main__':
-        HTMLTestRunner.main()
-
-
-For more customization options, instantiates a HTMLTestRunner object.
-HTMLTestRunner is a counterpart to unittest's TextTestRunner. E.g.
-
-    # output to a file
-    fp = file('my_report.html', 'wb')
-    runner = HTMLTestRunner.HTMLTestRunner(
-                stream=fp,
-                title='My unit test',
-                description='This demonstrates the report output by HTMLTestRunner.'
-                )
-
-    # Use an external stylesheet.
-    # See the Template_mixin class for more customizable options
-    runner.STYLESHEET_TMPL = '<link rel="stylesheet" href="my_stylesheet.css" type="text/css">'
-
-    # run the test
-    runner.run(my_test_suite)
-
-
-------------------------------------------------------------------------
-Copyright (c) 2004-2007, Wai Yip Tung
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-* 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 Wai Yip Tung nor the names of its contributors may be
-  used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""
-
-# URL: http://tungwaiyip.info/software/HTMLTestRunner.html
-
-__author__ = "Wai Yip Tung"
-__version__ = "0.8.3"
-
-
-"""
-Change History
+__version__ = "1.0.2"
 
-Version 0.8.3
-* Prevent crash on class or module-level exceptions (Darren Wurf).
-
-Version 0.8.2
-* Show output inline instead of popup window (Viorel Lupu).
-
-Version in 0.8.1
-* Validated XHTML (Wolfgang Borgert).
-* Added description of test classes and test cases.
-
-Version in 0.8.0
-* Define Template_mixin class for customization.
-* Workaround a IE 6 bug that it does not treat <script> block as CDATA.
-
-Version in 0.7.1
-* Back port to Python 2.3 (Frank Horowitz).
-* Fix missing scroll bars in detail log (Podi).
-"""
-
-# TODO: color stderr
-# TODO: simplify javascript using ,ore than 1 class in the class attribute?
-
-import datetime
-import StringIO
-import sys
-import time
-import unittest
+from datetime import datetime
+from io import StringIO
+from unittest import TestResult, TestProgram
 from xml.sax import saxutils
+import sys
 
 
 # ------------------------------------------------------------------------
 # The redirectors below are used to capture output during testing. Output
-# sent to sys.stdout and sys.stderr are automatically captured. However
-# in some cases sys.stdout is already cached before HTMLTestRunner is
+# sent to stdout and stderr are automatically captured. However
+# in some cases stdout is already cached before HTMLTestRunner is
 # invoked (e.g. calling logging.basicConfig). In order to capture those
 # output, use the redirectors for the cached stream.
 #
@@ -114,7 +20,7 @@
 
 def to_unicode(s):
     try:
-        return unicode(s)
+        return str(s)
     except UnicodeDecodeError:
         # s is non ascii byte string
         return s.decode('unicode_escape')
@@ -186,6 +92,7 @@ class Template_mixin(object):
     0: 'pass',
     1: 'fail',
     2: 'error',
+    3: 'skip',
     }
 
     DEFAULT_TITLE = 'Unit Test Report'
@@ -387,8 +294,10 @@ class Template_mixin(object):
 .passClass  { background-color: #6c6; }
 .failClass  { background-color: #c60; }
 .errorClass { background-color: #c00; }
+.skipClass  { background-color: #ff0; }
 .passCase   { color: #6c6; }
 .failCase   { color: #c60; font-weight: bold; }
+.skipCase   { color: #ff0; font-weight: bold; }
 .errorCase  { color: #c00; font-weight: bold; }
 .hiddenRow  { display: none; }
 .testcase   { margin-left: 2em; }
@@ -443,6 +352,7 @@ class Template_mixin(object):
     <td>Test Group/Test case</td>
     <td>Count</td>
     <td>Pass</td>
+    <td>Skip</td>
     <td>Fail</td>
     <td>Error</td>
     <td>View</td>
@@ -452,6 +362,7 @@ class Template_mixin(object):
     <td>Total</td>
     <td>%(count)s</td>
     <td>%(Pass)s</td>
+    <td>%(skip)s</td>
     <td>%(fail)s</td>
     <td>%(error)s</td>
     <td>&nbsp;</td>
@@ -464,6 +375,7 @@ class Template_mixin(object):
     <td>%(desc)s</td>
     <td>%(count)s</td>
     <td>%(Pass)s</td>
+    <td>%(skip)s</td>
     <td>%(fail)s</td>
     <td>%(error)s</td>
     <td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
@@ -519,18 +431,17 @@ class Template_mixin(object):
 # -------------------- The end of the Template class -------------------
 
 
-TestResult = unittest.TestResult
-
 class _TestResult(TestResult):
     # note: _TestResult is a pure representation of results.
     # It lacks the output and reporting ability compares to unittest._TextTestResult.
 
     def __init__(self, verbosity=1):
         TestResult.__init__(self)
-        self.outputBuffer = StringIO.StringIO()
+        self.outputBuffer = StringIO()
         self.stdout0 = None
         self.stderr0 = None
         self.success_count = 0
+        self.skip_count = 0
         self.failure_count = 0
         self.error_count = 0
         self.verbosity = verbosity
@@ -591,7 +502,7 @@ def addSuccess(self, test):
     def addError(self, test, err):
         self.error_count += 1
         TestResult.addError(self, test, err)
-        _, _exc_str = self.errors[-1]
+        _exc_str = self.errors[-1][1]
         output = self.complete_output()
         self.result.append((2, test, output, _exc_str))
         if self.verbosity > 1:
@@ -604,7 +515,7 @@ def addError(self, test, err):
     def addFailure(self, test, err):
         self.failure_count += 1
         TestResult.addFailure(self, test, err)
-        _, _exc_str = self.failures[-1]
+        _exc_str = self.failures[-1][1]
         output = self.complete_output()
         self.result.append((1, test, output, _exc_str))
         if self.verbosity > 1:
@@ -614,6 +525,19 @@ def addFailure(self, test, err):
         else:
             sys.stderr.write('F')
 
+    def addSkip(self, test, err):
+        self.skip_count += 1
+        TestResult.addSkip(self, test, err)
+        _exc_str = self.skipped[-1][1]
+        output = self.complete_output()
+        self.result.append((3, test, output, _exc_str))
+        if self.verbosity > 1:
+            sys.stderr.write('S  ')
+            sys.stderr.write(str(test))
+            sys.stderr.write('\n')
+        else:
+            sys.stderr.write('S')
+
 
 class HTMLTestRunner(Template_mixin):
     """
@@ -630,16 +554,16 @@ def __init__(self, stream=sys.stdout, verbosity=1, title=None, description=None)
         else:
             self.description = description
 
-        self.startTime = datetime.datetime.now()
+        self.startTime = datetime.now().replace(microsecond=0)
 
 
     def run(self, test):
         "Run the given test case or test suite."
         result = _TestResult(self.verbosity)
         test(result)
-        self.stopTime = datetime.datetime.now()
+        self.stopTime = datetime.now().replace(microsecond=0)
         self.generateReport(test, result)
-        print >>sys.stderr, '\nTime Elapsed: %s' % (self.stopTime-self.startTime)
+        print('Time Elapsed: {}'.format((self.stopTime-self.startTime)), file=sys.stderr)
         return result
 
 
@@ -650,7 +574,7 @@ def sortResult(self, result_list):
         classes = []
         for n,t,o,e in result_list:
             cls = t.__class__
-            if not rmap.has_key(cls):
+            if not cls in rmap:
                 rmap[cls] = []
                 classes.append(cls)
             rmap[cls].append((n,t,o,e))
@@ -663,10 +587,11 @@ def getReportAttributes(self, result):
         Return report attributes as a list of (name, value).
         Override this to add custom attributes.
         """
-        startTime = str(self.startTime)[:19]
+        startTime = str(self.startTime)
         duration = str(self.stopTime - self.startTime)
         status = []
         if result.success_count: status.append('Pass %s'    % result.success_count)
+        if result.skip_count:    status.append('Skip %s'    % result.skip_count   )
         if result.failure_count: status.append('Failure %s' % result.failure_count)
         if result.error_count:   status.append('Error %s'   % result.error_count  )
         if status:
@@ -695,7 +620,7 @@ def generateReport(self, test, result):
             report = report,
             ending = ending,
         )
-        self.stream.write(output.encode('utf8'))
+        self.stream.write(output)
 
 
     def _generate_stylesheet(self):
@@ -723,11 +648,12 @@ def _generate_report(self, result):
         sortedResult = self.sortResult(result.result)
         for cid, (cls, cls_results) in enumerate(sortedResult):
             # subtotal for a class
-            np = nf = ne = 0
+            np = ns = nf = ne = 0
             for n,t,o,e in cls_results:
                 if n == 0: np += 1
                 elif n == 1: nf += 1
-                else: ne += 1
+                elif n == 2: ne += 1
+                elif n == 3: ns += 1
 
             # format class description
             if cls.__module__ == "__main__":
@@ -738,9 +664,9 @@ def _generate_report(self, result):
             desc = doc and '%s: %s' % (name, doc) or name
 
             row = self.REPORT_CLASS_TMPL % dict(
-                style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
+                style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
                 desc = desc,
-                count = np+nf+ne,
+                count = np+ns+nf+ne,
                 Pass = np,
                 fail = nf,
                 error = ne,
@@ -753,8 +679,9 @@ def _generate_report(self, result):
 
         report = self.REPORT_TMPL % dict(
             test_list = ''.join(rows),
-            count = str(result.success_count+result.failure_count+result.error_count),
+            count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
             Pass = str(result.success_count),
+            skip = str(result.skip_count),
             fail = str(result.failure_count),
             error = str(result.error_count),
         )
@@ -774,13 +701,13 @@ def _generate_report_test(self, rows, cid, tid, n, t, o, e):
         if isinstance(o,str):
             # TODO: some problem with 'string_escape': it escape \n and mess up formating
             # uo = unicode(o.encode('string_escape'))
-            uo = o.decode('latin-1')
+            uo = bytes(o, 'utf-8').decode('latin-1')
         else:
             uo = o
         if isinstance(e,str):
             # TODO: some problem with 'string_escape': it escape \n and mess up formating
             # ue = unicode(e.encode('string_escape'))
-            ue = e.decode('latin-1')
+            ue = bytes(e, 'utf-8').decode('latin-1')
         else:
             ue = e
 
@@ -812,7 +739,7 @@ def _generate_ending(self):
 # Note: Reuse unittest.TestProgram to launch test. In the future we may
 # build our own launcher to support more specific command line
 # parameters like test title, CSS, etc.
-class TestProgram(unittest.TestProgram):
+class _TestProgram(TestProgram):
     """
     A variation of the unittest.TestProgram. Please refer to the base
     class for command line parameters.
@@ -823,9 +750,9 @@ def runTests(self):
         # we have to instantiate HTMLTestRunner before we know self.verbosity.
         if self.testRunner is None:
             self.testRunner = HTMLTestRunner(verbosity=self.verbosity)
-        unittest.TestProgram.runTests(self)
+        TestProgram.runTests(self)
 
-main = TestProgram
+main = _TestProgram
 
 ##############################################################################
 # Executing this module from the command line
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..132d2ff
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright (c) 2015, HTMLTestRunner Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* 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 HTMLTestRunner nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README b/README
deleted file mode 100644
index b1beea9..0000000
--- a/README
+++ /dev/null
@@ -1,5 +0,0 @@
-HTMLTestRunner is an extension to the Python standard library's unittest module.
-It generates easy to use HTML test reports. HTMLTestRunner is released under a
-BSD style license.
-
-Only a single file module HTMLTestRunner.py is needed to generate your report.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..173ceaf
--- /dev/null
+++ b/README.md
@@ -0,0 +1,70 @@
+## Synopsis
+
+HTMLTestRunner.py is a module extension above unittest in Python.  With it, you
+can quickly generate an HTML test report.  HTMLTestRunner is a counterpart to unittest's TextTestRunner. E.g.
+
+## Code Example
+
+### The simplest way to use this is to invoke its main method. E.g.
+
+    import unittest
+    import HTMLTestRunner
+
+    ... define your tests ...
+
+    if __name__ == '__main__':
+        HTMLTestRunner.main()
+
+
+### For more customization options, instantiates a HTMLTestRunner object.
+
+
+    # output to a file
+    fp = file('my_report.html', 'wb')
+    runner = HTMLTestRunner.HTMLTestRunner(
+                stream=fp,
+                title='My unit test',
+                description='This demonstrates the report output by HTMLTestRunner.'
+                )
+
+    # Use an external stylesheet.
+    # See the Template_mixin class for more customizable options
+    runner.STYLESHEET_TMPL = '<link rel="stylesheet" href="my_stylesheet.css" type="text/css">'
+
+    # run the test
+    runner.run(my_test_suite)
+
+
+## Motivation
+
+HTMLTestRunner was an easy to use library as a developer to quickly see a webpage
+based report.  It was originally created by tungwaiyip and upgraded recently for Python 3
+by dash0002.  In it's current iteration and maintenance, our goals are still the same;
+to be able to quickly generate an HTML test report.
+
+## Installation
+Supporting Python 3 - 3.5
+
+### PIP (recommended)
+
+### Copy and paste
+You can take a copy of the HTMLTestRunner.py and include it directly in your Project
+as-is.
+
+## Tests
+
+    python test_HTMLTestRunner.py
+
+## Contributors
+
+- Way Yip Tung - https://github.com/tungwaiyip
+- Asish Dash - https://github.com/dash0002
+- Dhruv Paranjape - https://github.com/dark-passenger
+- Ethan Estrada - https://github.com/eestrada
+
+Contributions are gladly accepted as this is a side project at best.  Please, also
+consider this when looking at feedback cycles, issues, pull requests, etc.
+
+## License
+
+HTMLTestRunner is licensed under http://choosealicense.com/licenses/bsd-3-clause/
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..f61234d
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,76 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "ubuntu/trusty64"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  config.vm.network "forwarded_port", guest: 8080, host: 8080 
+
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+  config.vm.synced_folder "..", "/vagrant_src"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # install OS software
+
+  config.vm.provision "shell", inline: "sudo apt-get update -y"
+  config.vm.provision "shell", inline: "sudo apt-get upgrade -y"
+  config.vm.provision "shell", inline: "sudo apt-get install -y unzip"
+  config.vm.provision "shell", inline: "sudo apt-get install -y python3-pip"
+  config.vm.provision "shell", inline: "sudo pip3 install -U pip"
+  config.vm.provision "shell", inline: "sudo apt-get install -y git"
+
+
+end
diff --git a/test_HTMLTestRunner.py b/test_HTMLTestRunner.py
index 3967ce8..0cc77cc 100644
--- a/test_HTMLTestRunner.py
+++ b/test_HTMLTestRunner.py
@@ -1,253 +1,52 @@
 # -*- coding: utf-8 -*-
 
-import StringIO
-import sys
-import unittest
+from io import StringIO
+from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
+from HTMLTestRunner import HTMLTestRunner
+
+import tests
+from tests.SampleTestPass import SampleTestPass
+from tests.SampleTestFail import SampleTestFail
+from tests.SampleTestBasic import SampleTestBasic
+
+class TestHTMLTestRunner(TestCase):
+    
+    def setUp(self):
+   
+        self.suite = TestSuite()
+        self.loader = TestLoader()
+
+        self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
+        self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
+        self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))
+
+        self.results_output_buffer = StringIO()
+        HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
+        self.byte_output = self.results_output_buffer.getvalue()
+
+    def test_SampleTestPass(self):
+        output1="".join(self.byte_output.split())
+        output2="".join(SampleTestPass.EXPECTED_RESULT.split())
+        self.assertGreater(output1.find(output2),0)
+    
+    @skip("Test Skipping")
+    def test_SampleTestSkip(self):
+        self.fail("This error should never be displayed")
+        
+    def test_SampleTestFail(self):
+        output1="".join(self.byte_output.split())
+        output2="".join(SampleTestFail.EXPECTED_RESULT.split())
+        self.assertGreater(output1.find(output2),0)
+        
+    def test_SampleTestBasic(self):
+        output1="".join(self.byte_output.split())
+        output2="".join(SampleTestBasic.EXPECTED_RESULT.split())
+        self.assertGreater(output1.find(output2),0)
+
+
+def main():
+    suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
+    TextTestRunner().run(suite)
 
-import HTMLTestRunner
-
-# ----------------------------------------------------------------------
-
-def safe_unicode(obj, *args):
-    """ return the unicode representation of obj """
-    try:
-        return unicode(obj, *args)
-    except UnicodeDecodeError:
-        # obj is byte string
-        ascii_text = str(obj).encode('string_escape')
-        return unicode(ascii_text)
-
-def safe_str(obj):
-    """ return the byte string representation of obj """
-    try:
-        return str(obj)
-    except UnicodeEncodeError:
-        # obj is unicode
-        return unicode(obj).encode('unicode_escape')
-
-# ----------------------------------------------------------------------
-# Sample tests to drive the HTMLTestRunner
-
-class SampleTest0(unittest.TestCase):
-    """ A class that passes.
-
-    This simple class has only one test case that passes.
-    """
-    def __init__(self, methodName):
-        unittest.TestCase.__init__(self, methodName)
-
-    def test_pass_no_output(self):
-        """        test description
-        """
-        pass
-
-class SampleTest1(unittest.TestCase):
-    """ A class that fails.
-
-    This simple class has only one test case that fails.
-    """
-    def test_fail(self):
-        u""" test description (描述) """
-        self.fail()
-
-class SampleOutputTestBase(unittest.TestCase):
-    """ Base TestCase. Generates 4 test cases x different content type. """
-    def test_1(self):
-        print self.MESSAGE
-    def test_2(self):
-        print >>sys.stderr, self.MESSAGE
-    def test_3(self):
-        self.fail(self.MESSAGE)
-    def test_4(self):
-        raise RuntimeError(self.MESSAGE)
-
-class SampleTestBasic(SampleOutputTestBase):
-    MESSAGE = 'basic test'
-
-class SampleTestHTML(SampleOutputTestBase):
-    MESSAGE = 'the message is 5 symbols: <>&"\'\nplus the HTML entity string: [&copy;] on a second line'
-
-class SampleTestLatin1(SampleOutputTestBase):
-    MESSAGE = u'the message is áéíóú'.encode('latin-1')
-
-class SampleTestUnicode(SampleOutputTestBase):
-    u""" Unicode (統一碼) test """
-    MESSAGE = u'the message is \u8563'
-    # 2006-04-25 Note: Exception would show up as
-    # AssertionError: <unprintable instance object>
-    #
-    # This seems to be limitation of traceback.format_exception()
-    # Same result in standard unittest.
-
-    # 2011-03-28 Note: I think it is fixed in Python 2.6
-    def test_pass(self):
-        u""" A test with Unicode (統一碼) docstring """
-        pass
-
-
-# ------------------------------------------------------------------------
-# This is the main test on HTMLTestRunner
-
-class Test_HTMLTestRunner(unittest.TestCase):
-
-    def test0(self):
-        self.suite = unittest.TestSuite()
-        buf = StringIO.StringIO()
-        runner = HTMLTestRunner.HTMLTestRunner(buf)
-        runner.run(self.suite)
-        # didn't blow up? ok.
-        self.assert_('</html>' in buf.getvalue())
-
-    def test_main(self):
-        # Run HTMLTestRunner. Verify the HTML report.
-
-        # suite of TestCases
-        self.suite = unittest.TestSuite()
-        self.suite.addTests([
-            unittest.defaultTestLoader.loadTestsFromTestCase(SampleTest0),
-            unittest.defaultTestLoader.loadTestsFromTestCase(SampleTest1),
-            unittest.defaultTestLoader.loadTestsFromTestCase(SampleTestBasic),
-            unittest.defaultTestLoader.loadTestsFromTestCase(SampleTestHTML),
-            unittest.defaultTestLoader.loadTestsFromTestCase(SampleTestLatin1),
-            unittest.defaultTestLoader.loadTestsFromTestCase(SampleTestUnicode),
-            ])
-
-        # Invoke TestRunner
-        buf = StringIO.StringIO()
-        #runner = unittest.TextTestRunner(buf)       #DEBUG: this is the unittest baseline
-        runner = HTMLTestRunner.HTMLTestRunner(
-                    stream=buf,
-                    title='<Demo Test>',
-                    description='This demonstrates the report output by HTMLTestRunner.'
-                    )
-        runner.run(self.suite)
-
-        # Define the expected output sequence. This is imperfect but should
-        # give a good sense of the well being of the test.
-        EXPECTED = u"""
-Demo Test
-
->SampleTest0:
-
->SampleTest1:
-
->SampleTestBasic
->test_1<
-pass
-basic test
-
->test_2<
-pass
-basic test
-
->test_3<
-fail
-AssertionError: basic test
-
->test_4<
-error
-RuntimeError: basic test
-
-
->SampleTestHTML
->test_1<
-pass
-the message is 5 symbols: &lt;&gt;&amp;"'
-plus the HTML entity string: [&amp;copy;] on a second line
-
->test_2<
-pass
-the message is 5 symbols: &lt;&gt;&amp;"'
-plus the HTML entity string: [&amp;copy;] on a second line
-
->test_3<
-fail
-AssertionError: the message is 5 symbols: &lt;&gt;&amp;"'
-plus the HTML entity string: [&amp;copy;] on a second line
-
->test_4<
-error
-RuntimeError: the message is 5 symbols: &lt;&gt;&amp;"'
-plus the HTML entity string: [&amp;copy;] on a second line
-
-
->SampleTestLatin1
->test_1<
-pass
-the message is áéíóú
-
->test_2<
-pass
-the message is áéíóú
-
->test_3<
-fail
-AssertionError: the message is áéíóú
-
->test_4<
-error
-RuntimeError: the message is áéíóú
-
-
->SampleTestUnicode
->test_1<
-pass
-the message is \u8563
-
->test_2<
-pass
-the message is \u8563
-
->test_3<
-fail
-AssertionError:
-
->test_4<
-error
-RuntimeError:
-
-Total
->19<
->10<
->5<
->4<
-</html>
-"""
-        # check out the output
-        byte_output = buf.getvalue()
-        # output the main test output for debugging & demo
-        print byte_output
-        # HTMLTestRunner pumps UTF-8 output
-        output = byte_output.decode('utf-8')
-        self._checkoutput(output,EXPECTED)
-
-
-    def _checkoutput(self,output,EXPECTED):
-        i = 0
-        for lineno, p in enumerate(EXPECTED.splitlines()):
-            if not p:
-                continue
-            j = output.find(p,i)
-            if j < 0:
-                self.fail(safe_str('Pattern not found lineno %s: "%s"' % (lineno+1,p)))
-            i = j + len(p)
-
-
-
-
-##############################################################################
-# Executing this module from the command line
-##############################################################################
-
-import unittest
 if __name__ == "__main__":
-    if len(sys.argv) > 1:
-        argv = sys.argv
-    else:
-        argv=['test_HTMLTestRunner.py', 'Test_HTMLTestRunner']
-    unittest.main(argv=argv)
-    # Testing HTMLTestRunner with HTMLTestRunner would work. But instead
-    # we will use standard library's TextTestRunner to reduce the nesting
-    # that may confuse people.
-    #HTMLTestRunner.main(argv=argv)
-
+    main()
diff --git a/tests/SampleTestBasic.py b/tests/SampleTestBasic.py
new file mode 100644
index 0000000..ac495a7
--- /dev/null
+++ b/tests/SampleTestBasic.py
@@ -0,0 +1,96 @@
+import unittest
+import sys
+
+class SampleTestBasic(unittest.TestCase):
+    EXPECTED_RESULT = """
+<tr class='errorClass'>
+    <td>tests.SampleTestBasic.SampleTestBasic</td>
+    <td>4</td>
+    <td>2</td>
+    <td>1</td>
+    <td>1</td>
+    <td><a href="javascript:showClassDetail('c3',4)">Detail</a></td>
+</tr>
+
+<tr id='pt3.1' class='hiddenRow'>
+    <td class='none'><div class='testcase'>test_run_1</div></td>
+    <td colspan='5' align='center'>
+
+    <!--css div popup start-->
+    <a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt3.1')" >
+        pass</a>
+
+    <div id='div_pt3.1' class="popup_window">
+        <div style='text-align: right; color:red;cursor:pointer'>
+        <a onfocus='this.blur();' onclick="document.getElementById('div_pt3.1').style.display = 'none' " >
+           [x]</a>
+        </div>
+        <pre>
+        
+pt3.1: basic test
+
+
+        </pre>
+    </div>
+    <!--css div popup end-->
+
+    </td>
+</tr>
+
+<tr id='pt3.2' class='hiddenRow'>
+    <td class='none'><div class='testcase'>test_run_2</div></td>
+    <td colspan='5' align='center'>
+
+    <!--css div popup start-->
+    <a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt3.2')" >
+        pass</a>
+
+    <div id='div_pt3.2' class="popup_window">
+        <div style='text-align: right; color:red;cursor:pointer'>
+        <a onfocus='this.blur();' onclick="document.getElementById('div_pt3.2').style.display = 'none' " >
+           [x]</a>
+        </div>
+        <pre>
+        
+pt3.2: basic test
+basic test
+
+
+        </pre>
+    </div>
+    <!--css div popup end-->
+
+    </td>
+</tr>
+
+<tr id='ft3.3' class='none'>
+    <td class='failCase'><div class='testcase'>test_run_3</div></td>
+    <td colspan='5' align='center'>
+
+    <!--css div popup start-->
+    <a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_ft3.3')" >
+        fail</a>
+
+    <div id='div_ft3.3' class="popup_window">
+        <div style='text-align: right; color:red;cursor:pointer'>
+        <a onfocus='this.blur();' onclick="document.getElementById('div_ft3.3').style.display = 'none' " >
+           [x]</a>
+        </div>
+        <pre>
+        
+ft3.3: basic test
+basic test
+    """
+    MESSAGE = 'basic test'
+    
+    def test_run_1(self):
+        print(self.MESSAGE)
+
+    def test_run_2(self):
+        print(self.MESSAGE, file=sys.stderr)
+    
+    def test_run_3(self):
+        self.fail(self.MESSAGE)
+        
+    def test_run_4(self):
+        raise RuntimeError(self.MESSAGE)
diff --git a/tests/SampleTestFail.py b/tests/SampleTestFail.py
new file mode 100644
index 0000000..dce4ace
--- /dev/null
+++ b/tests/SampleTestFail.py
@@ -0,0 +1,34 @@
+import unittest
+
+
+class SampleTestFail(unittest.TestCase):
+    EXPECTED_RESULT = """
+<tr class='failClass'>
+    <td>tests.SampleTestFail.SampleTestFail</td>
+    <td>1</td>
+    <td>0</td>
+    <td>1</td>
+    <td>0</td>
+    <td><a href="javascript:showClassDetail('c2',1)">Detail</a></td>
+</tr>
+
+<tr id='ft2.1' class='none'>
+    <td class='failCase'><div class='testcase'>test_run_1</div></td>
+    <td colspan='5' align='center'>
+
+    <!--css div popup start-->
+    <a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_ft2.1')" >
+        fail</a>
+
+    <div id='div_ft2.1' class="popup_window">
+        <div style='text-align: right; color:red;cursor:pointer'>
+        <a onfocus='this.blur();' onclick="document.getElementById('div_ft2.1').style.display = 'none' " >
+           [x]</a>
+        </div>
+        <pre>
+        
+ft2.1: Traceback (most recent call last):
+    """
+    
+    def test_run_1(self):
+        self.fail()
diff --git a/tests/SampleTestPass.py b/tests/SampleTestPass.py
new file mode 100644
index 0000000..867034a
--- /dev/null
+++ b/tests/SampleTestPass.py
@@ -0,0 +1,21 @@
+import unittest
+
+class SampleTestPass(unittest.TestCase):
+    EXPECTED_RESULT = """
+<tr class='passClass'>
+    <td>tests.SampleTestPass.SampleTestPass</td>
+    <td>1</td>
+    <td>1</td>
+    <td>0</td>
+    <td>0</td>
+    <td><a href="javascript:showClassDetail('c1',1)">Detail</a></td>
+</tr>
+
+<tr id='pt1.1' class='hiddenRow'>
+    <td class='none'><div class='testcase'>test_run_1</div></td>
+    <td colspan='5' align='center'>pass</td>
+</tr>
+    """
+
+    def test_run_1(self):
+        pass
\ No newline at end of file
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29