diff --git a/.travis.yml b/.travis.yml
index 8847dc3..cb8d754 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,4 @@ python:
 # command to install dependencies
 install: "pip install -r requirements.txt"
 # command to run tests
-script: python tests.py
+script: python -m unittest
diff --git a/README.md b/README.md
index dda27c4..79cf2bb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 ### Status
+
 [![Build Status](https://travis-ci.org/danidee10/Staticfy.svg?branch=master)](https://travis-ci.org/danidee10/Staticfy) [![Code Climate](https://codeclimate.com/github/danidee10/Staticfy/badges/gpa.svg)](https://codeclimate.com/github/danidee10/Staticfy)
 
 # Staticfy
+
 You just got a brand new template fron the front-end designer,  Everything's going well, Until you realize the amount of time you'll spend manually changing the links in the html templates you until all the static files and assets are properly linked and the file looks exactly like the demo he/she showed you.
 with Staticfy you can save that time (and some of your hair) by automatically converting the static urls in your template to dynamic url's that wouldn't break if you decide to move your file to another location.
 
@@ -16,14 +18,17 @@ To this:
 and then your web framework's templating language can resolve the tags to the right url.
 
 # Get it in 10 seconds!
+
 It's available as a package on PyPi so you can install it with
 
 ```bash
 pip install staticfy
 ```
+
 That's all!
 
 Run it straight from the command line with:
+
 ```bash
 staticfy staticfy.html --static-endpoint=static --add-tags='{"img": "data-url"}'
 ```
@@ -37,9 +42,11 @@ staticfy staticfy.html -o new.html
 ```
 
 ### Before Staticfying
+
 ![alt tag](assets/before.png)
 ---------------------------------------------------------------------------------------------------------------------------------
 ### After Staticfying
+
 ![alt tag](assets/after.png)
 
 Notice how it preserves the font-awesome css link at the top of the file?, external resources (images, scripts, font-awesome, google-fonts, bootstrap files, disqus e.t.c) which aren't hosted locally with your website won't be staticfied. Staticfy also accepts an optional argument `--static-endpoint` in case you're not using the default static endpoint.
@@ -47,6 +54,7 @@ Notice how it preserves the font-awesome css link at the top of the file?, exter
 Staticy also preserves the indentation and formatting of any html file given to it, so your html file(s) are still look the same way and are still readablebe just the way they were before you staticfied them.
 
 # Additional tags and attributes
+
 By default staticfy identifies and staticfies the following tags:
  1. img tags with src attributes -- `<img src="" />`
  2. link tags with rel attributes -- `<link rel="" />`
@@ -61,9 +69,11 @@ staticfy staticfy.html --add-tags='{"div": "data-src"}'
 Sure enough it gets staticfied.
 
 ### Before staticfying
+
 ![alt tag](assets/before_add_tag.png)
 
 ### After staticfying
+
 ![alt tag](assets/after_add_tag.png)
 
 You can exclude certain tags you don't want to be staticfied by specifying the `--exc-tags` parameter, like `--add-tags` it expects a valid JSON string.
@@ -78,6 +88,7 @@ It should be noted that sub folders containing html files won't be staticfied, o
 Whenever you run staticfy on a template or on a folder, a staticfy folder is generated in the present working directory and the staticfied file(s) is placed in that folder, you also need to copy the file(s) over to the appropriate directory to overwrite the existing file with the new one.
 
 # Namespacing
+
 When your project gets big, It's necessary to namespace static assets to avoid name collision, you can achieve this by passing a string to the `--namespace` argument. The string would automatically be prepended to the url. For example in django
 
 ```bash
@@ -88,6 +99,7 @@ Would convert `<img src="img/staticfy.jpg" />` to this `<img src="{% url static
 
 
 # Inconsistency with single and double quotes in html
+
 Staticfy also converts all single quoted html attributes to double quoted attributes. It's very common to see html files that look like this.
 
 ``` html
@@ -104,6 +116,7 @@ Staticfy also converts all single quoted html attributes to double quoted attrib
 
 </html>
 ```
+
 You can easily fix all the inconsistencies by running staticfy on that file. There also *little* performance benefits to be gained when you gzip an html file that has consistent use of quotes (either double or single) against an inconsistent one. Don't believe it...Look at this
 
 ![alt tag](assets/staticfy.gif)
@@ -113,7 +126,9 @@ You can see a reduction from `219 bytes` to `204 bytes`, of course this differen
 HTML is a very forgiving, and you're allowed to use single quotes or double quotes. but the double quotes are the **Unofficial Standard**
 
 # Using staticfy with other frameworks
+
 Staticfy was initially built with flask in mind, but it can also be extended to support other frameworks easily, out of the box it supports:
+
  1. flask
  2. django and
  3. laravel
@@ -128,27 +143,30 @@ export STATICFY_FRAMEWORK=django
 If you specify a framework that isn't found, staticfy would cry and gracefully fall back to it's flask roots.
 
 # Tests
-The tests are located in the `test.py` file and can be run with:
 
-`python3 test.py`
+The tests can be run with the standard `unittest` module using:
+
+`python -m unittest`
 
 # Python support
+
 Staticfy supports both python2 and python3
 **(python 2.7 >)**
 
 # Requirements and 3rd party stuff
-Beautiful soup 4
-`pip3 install bs4`
 
-You can use the requirements file `pip3 install -r requirements.txt`
+The only dependency is `Beautiful soup 4`
 
-If you have issues with importing HTML.parser on python 3.5, upgrade beautifulSoup:
+You can use the requirements file `pip install -r requirements.txt`
+
+If you have issues with importing `HTML.parser` on `python 3.5`, upgrade `beautifulSoup` with:
 
 `pip install --upgrade beautifulsoup4`
 
 # Contribution
+
 Pull requests and issues are highly welcome. I'm still looking to support as many web frameworks as possible.
 
 Describe clearly what your PR attempts to fix (if it's a bug) or improve (If it's an existing feature).
 
-If you want to add support for a new web framework, add the required pattern for the framework to the `frameworks` dictionary in `__config__.py`, make your tests pass and submit your Pull request.
+If you want to add support for a new web framework, add the required pattern for the framework to the `frameworks` dictionary in `__config__.py`, (You may also need to create a plugin if it's not a simple transform) make your tests pass and submit your Pull request.