diff --git a/readme.md b/readme.md
index e293fc0..1a5d1a8 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,97 @@
-WebAPIContrib
-=============
-
-Community Contributions for ASP.NET Web API
-
-http://webapicontrib.github.com/
\ No newline at end of file
+WebApiContrib.Formatting.Razor
+=============
+
+A 'MediaTypeFormatter' for generating HTML markup for [ASP.NET Web API](http://asp.net/web-api) applications.
+
+Overview
+
+Before we dive into the details, here is a simple example of using the [`HtmlMediaTypeViewFormatter`](https://github.com/WebApiContrib/WebApiContrib.Formatting.Html/blob/master/src/WebApiContrib.Formatting.Html/Formatters/HtmlMediaTypeViewFormatter.cs) with Razor:
+
+    public class CustomerController : ApiController
+    {
+        public Customer Get()
+        {
+            return new Customer { Name = "John Doe", Country = "Country" };
+        }
+    }
+
+This controller will simply return a Customer as JSON or XAML based on the "Accept" or "content-type" header.
+
+By adding the HtmlMediaTypeViewFormatter to the global.asax and using the [`RazorViewLocator`](https://github.com/WebApiContrib/WebApiContrib.Formatting.Razor/blob/master/src/WebApiContrib.Formatting.Razor/RazorViewLocator.cs) and a [`RazorViewParser`](https://github.com/WebApiContrib/WebApiContrib.Formatting.Razor/blob/master/src/WebApiContrib.Formatting.Razor/RazorViewParser.cs) the code can also render the model as  HTML by using a Razor view. By default the view will be located by convention, using the name of the returned model in this case "Customer.cshtml" or "Customer.vbhtml".
+    
+    protected void Application_Start()
+    {
+        //...
+
+        GlobalConfiguration.Configuration.Formatters.Add(new HtmlMediaTypeViewFormatter());
+        
+        GlobalViews.DefaultViewParser = new RazorViewParser();
+        GlobalViews.DefaultViewLocator = new RazorViewLocator();
+        
+        //...
+    }
+
+The [`GlobalViews`](https://github.com/WebApiContrib/WebApiContrib.Formatting.Html/blob/master/src/WebApiContrib.Formatting.Html/Configuration/GlobalViews.cs) and [`HtmlMediaTypeViewFormatter`](https://github.com/WebApiContrib/WebApiContrib.Formatting.Html/blob/master/src/WebApiContrib.Formatting.Html/Formatters/HtmlMediaTypeViewFormatter.cs) comes from the [WebApiContrib.Formatting.Html](https://github.com/WebApiContrib/WebApiContrib.Formatting.Html) project.
+
+Views should be added to the web api projects ["~/Views"](https://github.com/WebApiContrib/WebApiContrib.Formatting.Razor/tree/master/samples/MvcWebApiSiteTest/Views) folder. Here is an example of a View:
+
+    <html>Hello @Model.Name! Welcome to Razor!</html>
+
+2 Install packages
+
+Get it from [NuGet](http://nuget.org/packages/WebApiContrib.Formatting.Razor):
+
+    Install-Package WebApiContrib.Formatting.Razor
+
+3 How the View locator works
+
+The razor view locator [`RazorViewLocator`](https://github.com/WebApiContrib/WebApiContrib.Formatting.Razor/blob/master/src/WebApiContrib.Formatting.Razor/RazorViewLocator.cs) vill try to locate a view by using either, convention, annotation, configuration or by returning a View. The views must be located in the follwoing folders:
+
+    ~\Views
+    ~\Views\Shared
+
+The "~" is the root folder of the web application. Both .cshtml and .vbhtml are supported.
+
+Note: There is no way to specify another paths at this moment, it's easy to implement a view locator. It's done by implementing the [`IViewLocator`](https://github.com/WebApiContrib/WebApiContrib.Formatting.Html/blob/master/src/WebApiContrib.Formatting.Html/Locators/IViewLocator.cs) interface located in the [WebApiContrib.Formatting.Html](https://github.com/WebApiContrib/WebApiContrib.Formatting.Html) assembly.
+
+3.1 Using convention
+
+By default the RazorViewLocator will locate a view by convention, it will try to find a view by the name of the model returned by the ApiController's methods. The following code will try to find a view with the name "Customer" in the "Views" or "Views\Shared" folder and use it to render the returnd 
+
+Customer model:
+
+
+    public class CustomerController : ApiController
+    {
+        public Customer Get()
+        {
+            return new Customer { Name = "John Doe", Country = "Country" };
+        }
+    }
+
+To use the ApiController to render the Customer model with the Customer view, just use the following path in browser:
+
+http://localhost/mysite/customer
+
+3.2 Using annotation
+
+A view could be specified for a specific mode by adding the [`ViewAttribute`](https://github.com/WebApiContrib/WebApiContrib.Formatting.Razor/blob/master/samples/MvcWebApiSiteTest/Controllers/HomeController.cs#L10) to the model returned by a ApiController method.
+
+
+    public class CustomerController : ApiController
+    {
+        public Customer Get()
+        {
+            return new Customer { Name = "John Doe", Country = "Country" };
+        }
+    }
+        
+    [View("CustomerViaAttrib")]
+    public class Customer
+    {
+        public string Name { get; set; }
+
+        public string Country { get; set; }
+    }
+
+This code will try to locate a view with the name "CustomerViaAttrib".
diff --git a/samples/MvcWebApiSiteTest/Content/Site.css b/samples/MvcWebApiSiteTest/Content/Site.css
index 33d4e26..7973189 100644
--- a/samples/MvcWebApiSiteTest/Content/Site.css
+++ b/samples/MvcWebApiSiteTest/Content/Site.css
@@ -1,432 +1,856 @@
-﻿
-/*******************************************************************************
-Slate Theme for Github Pages
-by Jason Costello, @jsncostello
-*******************************************************************************/
-
-@import url(pygment_trac.css);
-
-/*******************************************************************************
-MeyerWeb Reset
-*******************************************************************************/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font: inherit;
-  vertical-align: baseline;
+﻿html {
+    background-color: #e2e2e2;
+    margin: 0;
+    padding: 0;
 }
 
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block;
+body {
+    background-color: #fff;
+    border-top: solid 10px #000;
+    color: #333;
+    font-size: .85em;
+    font-family: "Segoe UI", Verdana, Helvetica, Sans-Serif;
+    margin: 0;
+    padding: 0;
 }
 
-ol, ul {
-  list-style: none;
+a {
+    color: #333;
+    outline: none;
+    padding-left: 3px;
+    padding-right: 3px;
+    text-decoration: underline;
 }
 
-blockquote, q {
+    a:link, a:visited,
+    a:active, a:hover {
+        color: #333;
+    }
+
+    a:hover {
+        background-color: #c7d1d6;
+    }
+
+header, footer, hgroup,
+nav, section {
+    display: block;
 }
 
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
+mark {
+    background-color: #a6dbed;
+    padding-left: 5px;
+    padding-right: 5px;
 }
 
-a:focus {
-  outline: none;
+.float-left {
+    float: left;
 }
 
-/*******************************************************************************
-Theme Styles
-*******************************************************************************/
+.float-right {
+    float: right;
+}
 
-body {
-  box-sizing: border-box;
-  color:#373737;
-  background: #212121;
-  font-size: 16px;
-  font-family: 'Myriad Pro', Calibri, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  -webkit-font-smoothing: antialiased;
+.clear-fix:after {
+    content: ".";
+    clear: both;
+    display: block;
+    height: 0;
+    visibility: hidden;
 }
 
-h1, h2, h3, h4, h5, h6 {
-  margin: 10px 0;
-  font-weight: 700;
-  color:#222222;
-  font-family: 'Lucida Grande', 'Calibri', Helvetica, Arial, sans-serif;
-  letter-spacing: -1px;
+h1, h2, h3,
+h4, h5, h6 {
+    color: #000;
+    margin-bottom: 0;
+    padding-bottom: 0;
 }
 
 h1 {
-  font-size: 36px;
-  font-weight: 700;
+    font-size: 2em;
 }
 
 h2 {
-  padding-bottom: 10px;
-  font-size: 32px;
-  background: url('../images/bg_hr.png') repeat-x bottom;
+    font-size: 1.75em;
 }
 
 h3 {
-  font-size: 24px;
+    font-size: 1.2em;
+    margin-bottom: 1.2em;
 }
 
 h4 {
-  font-size: 21px;
+    font-size: 1.1em;
 }
 
-h5 {
-  font-size: 18px;
+h5, h6 {
+    font-size: 1em;
 }
 
-h6 {
-  font-size: 16px;
-}
 
-p {
-  margin: 10px 0 15px 0;
+/* main layout
+----------------------------------------------------------*/
+.content-wrapper {
+    margin: 0 auto;
+    max-width: 960px;
 }
 
-footer p {
-  color: #f2f2f2;
+#body {
+    background-color: #efeeef;
+    clear: both;
+    padding-bottom: 35px;
 }
 
-a {
-  text-decoration: none;
-  color: #007edf;
-  text-shadow: none;
+    .main-content {
+        background: url("../Images/accent.png") no-repeat;
+        padding-left: 10px;
+        padding-top: 30px;
+    }
+
+    .featured + .main-content {
+        background: url("../Images/heroAccent.png") no-repeat;
+    }
 
-  transition: color 0.5s ease;
-  transition: text-shadow 0.5s ease;
-  -webkit-transition: color 0.5s ease;
-  -webkit-transition: text-shadow 0.5s ease;
-  -moz-transition: color 0.5s ease;
-  -moz-transition: text-shadow 0.5s ease;
-  -o-transition: color 0.5s ease;
-  -o-transition: text-shadow 0.5s ease;
-  -ms-transition: color 0.5s ease;
-  -ms-transition: text-shadow 0.5s ease;
+footer {
+    clear: both;
+    background-color: #e2e2e2;
+    font-size: .8em;
+    height: 100px;
 }
 
-#main_content a:hover {
-  color: #0069ba;
-  text-shadow: #0090ff 0px 0px 2px;
+
+/* site title
+----------------------------------------------------------*/
+.site-title {
+    color: #c8c8c8;
+    font-family: Rockwell, Consolas, "Courier New", Courier, monospace;
+    font-size: 2.3em;
+    margin: 20px 0;
 }
 
-footer a:hover {
-  color: #43adff;
-  text-shadow: #0090ff 0px 0px 2px;
+.site-title a, .site-title a:hover, .site-title a:active {
+    background: none;
+    color: #c8c8c8;
+    outline: none;
+    text-decoration: none;
 }
 
-em {
-  font-style: italic;
+
+/* login
+----------------------------------------------------------*/
+#login {
+    display: block;
+    font-size: .85em;
+    margin: 20px 0 12px;
+    text-align: right;
 }
 
-strong {
-  font-weight: bold;
+    #login a {
+        background-color: #d3dce0;
+        margin-left: 10px;
+        margin-right: 3px;
+        padding: 2px 3px;
+        text-decoration: none;
+    }
+
+    #login a.username {
+        background: none;
+        margin-left: 0px;
+        text-decoration: underline;
+    }
+
+    #login ul {
+        margin: 0;
+    }
+
+    #login li {
+        display: inline;
+        list-style: none;
+    }
+
+
+/* menu
+----------------------------------------------------------*/
+ul#menu {
+    font-size: 1.3em;
+    font-weight: 600;
+    margin: 20px 0;
+    text-align: right;
 }
 
-img {
-  position: relative;
-  margin: 0 auto;
-  max-width: 739px;
-  padding: 5px;
-  margin: 10px 0 10px 0;
-  border: 1px solid #ebebeb;
+    ul#menu li {
+        display: inline;
+        list-style: none;
+        padding-left: 15px;
+    }
+
+        ul#menu li a {
+            background: none;
+            color: #999;
+            text-decoration: none;
+        }
+
+        ul#menu li a:hover {
+            color: #333;
+            text-decoration: none;
+        }
 
-  box-shadow: 0 0 5px #ebebeb;
-  -webkit-box-shadow: 0 0 5px #ebebeb;
-  -moz-box-shadow: 0 0 5px #ebebeb;
-  -o-box-shadow: 0 0 5px #ebebeb;
-  -ms-box-shadow: 0 0 5px #ebebeb;
+
+/* page elements
+----------------------------------------------------------*/
+/* featured */
+.featured {
+    background-color: #fff;
 }
 
-pre, code {
-  width: 100%;
-  color: #222;
-  background-color: #fff;
+    .featured .content-wrapper {
+        background-color: #7ac0da;
+        background-image: -ms-linear-gradient(left, #7ac0da 0%, #a4d4e6 100%);
+        background-image: -o-linear-gradient(left, #7ac0da 0%, #a4d4e6 100%);
+        background-image: -webkit-gradient(linear, left top, right top, color-stop(0, #7ac0da), color-stop(1, #a4d4e6));
+        background-image: -webkit-linear-gradient(left, #7ac0da 0%, #a4d4e6 100%);
+        background-image: linear-gradient(left, #7ac0da 0%, #a4d4e6 100%);
+        color: #3e5667;
+        padding: 20px 40px 30px 40px;
+    }
 
-  font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
-  font-size: 14px;
+        .featured hgroup.title h1, .featured hgroup.title h2 {
+            color: #fff;
+        }
 
-  border-radius: 2px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
+        .featured p {
+            font-size: 1.1em;
+        }
 
+/* page titles */
+hgroup.title {
+    margin-bottom: 10px;
+}
 
+hgroup.title h1, hgroup.title h2 {
+    display: inline;
+}
 
+hgroup.title h2 {
+    font-weight: normal;
+    margin-left: 3px;
 }
 
-pre {
-  width: 100%;
-  padding: 10px;
-  box-shadow: 0 0 10px rgba(0,0,0,.1);
-  overflow: auto;
+/* features */
+section.feature {
+    width: 300px;
+    float: left;
+    padding: 10px;
 }
 
-code {
-  padding: 3px;
-  margin: 0 3px;
-  box-shadow: 0 0 10px rgba(0,0,0,.1);
+/* ordered list */
+ol.round {
+    list-style-type: none;
+    padding-left: 0;
 }
 
-pre code {
-  display: block;
-  box-shadow: none;
+    ol.round li {
+        margin: 25px 0;
+        padding-left: 45px;
+    }
+
+        ol.round li.zero {
+            background: url("../Images/orderedList0.png") no-repeat;
+        }
+
+        ol.round li.one {
+            background: url("../Images/orderedList1.png") no-repeat;
+        }
+
+        ol.round li.two {
+            background: url("../Images/orderedList2.png") no-repeat;
+        }
+
+        ol.round li.three {
+            background: url("../Images/orderedList3.png") no-repeat;
+        }
+
+        ol.round li.four {
+            background: url("../Images/orderedList4.png") no-repeat;
+        }
+
+        ol.round li.five {
+            background: url("../Images/orderedList5.png") no-repeat;
+        }
+
+        ol.round li.six {
+            background: url("../Images/orderedList6.png") no-repeat;
+        }
+
+        ol.round li.seven {
+            background: url("../Images/orderedList7.png") no-repeat;
+        }
+
+        ol.round li.eight {
+            background: url("../Images/orderedList8.png") no-repeat;
+        }
+
+        ol.round li.nine {
+            background: url("../Images/orderedList9.png") no-repeat;
+        }
+
+/* content */
+article {
+    float: left;
+    width: 70%;
 }
 
-blockquote {
-  color: #666;
-  margin-bottom: 20px;
-  padding: 0 0 0 20px;
-  border-left: 3px solid #bbb;
+aside {
+    float: right;
+    width: 25%;
 }
 
-ul, ol, dl {
-  margin-bottom: 15px
+    aside ul {
+        list-style: none;
+        padding: 0;
+    }
+
+        aside ul li {
+            background: url("../Images/bullet.png") no-repeat 0 50%;
+            padding: 2px 0 2px 20px;
+        }
+
+.label {
+    font-weight: 700;
 }
 
-ul li {
-  list-style: inside;
-  padding-left: 20px;
+/* login page */
+#loginForm {
+    border-right: solid 2px #c8c8c8;
+    float: left;
+    width: 45%;
 }
 
-ol li {
-  list-style: decimal inside;
-  padding-left: 20px;
+    #loginForm .validation-error {
+        display: block;
+        margin-left: 15px;
+    }
+
+#socialLoginForm {
+    margin-left: 40px;
+    float: left;
+    width: 50%;
 }
 
-dl dt {
-  font-weight: bold;
+/* contact */
+.contact h3 {
+    font-size: 1.2em;
 }
 
-dl dd {
-  padding-left: 20px;
-  font-style: italic;
+.contact p {
+    margin: 5px 0 0 10px;
 }
 
-dl p {
-  padding-left: 20px;
-  font-style: italic;
+.contact iframe {
+    border: 1px solid #333;
+    margin: 5px 0 0 10px;
 }
 
-hr {
-  height: 1px;
-  margin-bottom: 5px;
-  border: none;
-  background: url('../images/bg_hr.png') repeat-x center;
+/* forms */
+fieldset {
+    border: none;
+    margin: 0;
+    padding: 0;
 }
 
-table {
-  border: 1px solid #373737;
-  margin-bottom: 20px;
-  text-align: left;
- }
+    fieldset legend {
+        display: none;
+    }
+    
+    fieldset ol {
+        padding: 0;
+        list-style: none;
+    }
 
-th {
-  font-family: 'Lucida Grande', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  padding: 10px;
-  background: #373737;
-  color: #fff;
- }
+        fieldset ol li {
+            padding-bottom: 5px;
+        }
 
-td {
-  padding: 10px;
-  border: 1px solid #373737;
- }
+    fieldset label {
+        display: block;
+        font-size: 1.2em;
+        font-weight: 600;
+    }
+
+    fieldset label.checkbox {
+        display: inline;
+    }
+
+    fieldset input[type="text"],
+    fieldset input[type="password"] {
+        border: 1px solid #e2e2e2;
+        color: #333;
+        font-size: 1.2em;
+        margin: 5px 0 6px 0;
+        padding: 5px;
+        width: 300px;
+    }
+
+        fieldset input[type="text"]:focus,
+        fieldset input[type="password"]:focus {
+            border: 1px solid #7ac0da;
+        }
+
+    fieldset input[type="submit"] {
+        background-color: #d3dce0;
+        border: 1px solid #787878;
+        cursor: pointer;
+        font-size: 1.2em;
+        font-weight: 600;
+        padding: 7px;
+    }
 
-form {
-  background: #f2f2f2;
-  padding: 20px;
+/* ajax login/registration dialog */
+.ui-dialog {
+    font-family: inherit;
+    font-size: 1.0em;
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    border-radius: 0;
+    border: 0 none;
 }
 
-img {
-  width: 100%;
-  max-width: 100%;
+    .ui-dialog input {
+        font-family: inherit;
+        font-size: 1.25em;
+    }
+
+.ui-dialog-titlebar {
+    color: inherit;
+    font-weight: inherit;
+    border: 0 none;
+    background: none;
+    float: right;    
+}
+
+.ui-dialog-titlebar-close {
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    border-radius: 0;
+}
+
+.ui-widget-header {   
+    border: 0 none;
+    background: none;  
+}
+
+.modal-popup {
+    
+}
+
+    .modal-popup input[type="text"],
+    .modal-popup input[type="password"] {
+        width: 90%;
+    }
+
+/* info and errors */
+.message-info {
+    border: 1px solid;
+    clear: both;
+    padding: 10px 20px;
 }
 
-/*******************************************************************************
-Full-Width Styles
-*******************************************************************************/
+.message-error {
+    clear: both;
+    color: #e80c4d;
+    font-size: 1.1em;
+    font-weight: bold;
+    margin: 20px 0 10px 0;
+}
 
-.outer {
-  width: 100%;
+.message-success {
+    color: #7ac0da;
+    font-size: 1.3em;
+    font-weight: bold;
+    margin: 20px 0 10px 0;
 }
 
-.inner {
-  position: relative;
-  max-width: 640px;
-  padding: 20px 10px;
-  margin: 0 auto;
+.error {
+    color: #e80c4d;
 }
 
-#forkme_banner {
-  display: block;
-  position: absolute;
-  top:0;
-  right: 10px;
-  z-index: 10;
-  padding: 10px 50px 10px 10px;
-  color: #fff;
-  background: url('../images/blacktocat.png') #0090ff no-repeat 95% 50%;
-  font-weight: 700;
-  box-shadow: 0 0 10px rgba(0,0,0,.5);
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
+/* styles for validation helpers */
+.field-validation-error {
+    color: #e80c4d;
+    font-weight: bold;
 }
 
-#header_wrap {
-  background: #212121;
-  background: -moz-linear-gradient(top, #373737, #212121);
-  background: -webkit-linear-gradient(top, #373737, #212121);
-  background: -ms-linear-gradient(top, #373737, #212121);
-  background: -o-linear-gradient(top, #373737, #212121);
-  background: linear-gradient(top, #373737, #212121);
+.field-validation-valid {
+    display: none;
 }
 
-#header_wrap .inner {
-  padding: 50px 10px 30px 10px;
+input[type="text"].input-validation-error,
+input[type="password"].input-validation-error {
+    border: 1px solid #e80c4d;
 }
 
-#project_title {
-  margin: 0;
-  color: #fff;
-  font-size: 42px;
-  font-weight: 700;
-  text-shadow: #111 0px 0px 10px;
+.validation-summary-errors {
+    color: #e80c4d;
+    font-weight: bold;
+    font-size: 1.1em;
 }
 
-#project_tagline {
-  color: #fff;
-  font-size: 24px;
-  font-weight: 300;
-  background: none;
-  text-shadow: #111 0px 0px 10px;
+.validation-summary-valid {
+    display: none;
 }
 
-#downloads {
-  position: absolute;
-  width: 210px;
-  z-index: 10;
-  bottom: -40px;
-  right: 0;
-  height: 70px;
-  background: url('../images/icon_download.png') no-repeat 0% 90%;
+ul#social li {
+    display: inline;
+    list-style: none;
 }
 
-.zip_download_link {
-  display: block;
-  float: right;
-  width: 90px;
-  height:70px;
-  text-indent: -5000px;
-  overflow: hidden;
-  background: url(../images/sprite_download.png) no-repeat bottom left;
+    ul#social li a {
+        color: #999;
+        text-decoration: none;
+    }
+
+    a.facebook, a.twitter {
+        display: block;
+        float: left;
+        height: 24px;
+        padding-left: 17px;
+        text-indent: -9999px;
+        width: 16px;
+    }
+
+    a.facebook {
+        background: url("../Images/facebook.png") no-repeat;
+    }
+
+    a.twitter {
+        background: url("../Images/twitter.png") no-repeat;
+    }
+
+/* tables
+----------------------------------------------------------*/
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    margin-top: 0.75em;
+    border: 0 none;
 }
 
-.tar_download_link {
-  display: block;
-  float: right;
-  width: 90px;
-  height:70px;
-  text-indent: -5000px;
-  overflow: hidden;
-  background: url(../images/sprite_download.png) no-repeat bottom right;
-  margin-left: 10px;
+th {
+	font-size: 1.2em;
+    text-align: left;
+    border: none 0px;
+    padding-left: 0;
+}
+
+    th a {
+        display: block;
+        position: relative;
+        
+    }
+
+	th a:link, th a:visited, th a:active, th a:hover {
+		color: #333;
+		font-weight: 600;
+		text-decoration: none;
+        padding: 0;
+	}
+
+	th a:hover {
+		color: #000;
+	}
+
+    th.asc a, th.desc a {
+        margin-right: .75em;
+    }
+    
+    th.asc a:after, th.desc a:after {
+		display: block;
+        position: absolute;
+        right: 0em;
+        top: 0;
+        font-size: 0.75em;
+	}
+
+	th.asc a:after {
+		content: '▲';
+	}
+
+	th.desc a:after {
+		content: '▼';
+	}
+
+td {
+    padding: 0.25em 2em 0.25em 0em;
+    border: 0 none;
 }
 
-.zip_download_link:hover {
-  background: url(../images/sprite_download.png) no-repeat top left;
+tr.pager td {
+    padding: 0 0.25em 0 0;
 }
 
-.tar_download_link:hover {
-  background: url(../images/sprite_download.png) no-repeat top right;
+#menu .index {
+	padding: 0.5em 1.5em;
+	position: relative;
 }
 
-#main_content_wrap {
-  background: #f2f2f2;
-  border-top: 1px solid #111;
-  border-bottom: 1px solid #111;
+#menu .index a {
+	padding-right: 1em;
+	position: relative;
+	z-index: 15;
+	padding-bottom: 0.125em;
+    color: #555;
 }
+#menu .index:hover a, #menu .index a:hover { background-position: right -81px; }
+
+#menu .index #guides a:hover { color: #FFF; }
+
 
-#main_content {
-  padding-top: 40px;
+ 
+#guides {
+	width: 27em;
+	display: block;
+	background: #a6dbed;
+	border-radius: 1em;
+	-webkit-border-radius: 1em;
+	-moz-border-radius: 1em;
+	-webkit-box-shadow: 0.25em 0.25em 1em rgba(0,0,0,0.25);
+	-moz-box-shadow: rgba(0,0,0,0.25) 0.25em 0.25em 1em;
+	color: #000;
+	padding: 1.5em 2em;
+	position: absolute;
+	z-index: 10;
+	top: -0.25em;
+	right: 0;
+	padding-top: 2em;
 }
 
-#footer_wrap {
-  background: #212121;
+#guides dt, #guides dd {
+	font-weight: bold;
+	font-size: 0.722em;
+	margin: 0;
+	padding: 0;
+    text-align: left;
 }
 
+#guides dd {
+	font-weight: normal;
+   }
 
+.clearfix {display: inline-block;}
 
-/*******************************************************************************
-Small Device Styles
-*******************************************************************************/
+#guides dt {padding:0; margin: 0.5em 0 0;}
 
-@media screen and (max-width: 480px) {
-  body {
-    font-size:14px;
-  }
+#guides a { color: #FFF; background: none !important;}
 
-  #downloads {
-    display: none;
-  }
+#guides .L, #guides .R {float: left; width: 50%; margin: 0; padding: 0;}
 
-  .inner {
-    min-width: 320px;
-    max-width: 480px;
-  }
+#guides .R {float: right;}
 
-  #project_title {
-  font-size: 32px;
-  }
 
-  h1 {
-    font-size: 28px;
-  }
+#toc
+{
+    border-radius: 2em;
+	-webkit-border-radius: 2em;
+	-moz-border-radius: 2em;
+    background-color: #FFF;
+    margin-left: 2em;
+}
 
-  h2 {
-    font-size: 24px;
-  }
+#toc #toc-heading {
+    padding-left: 1.2em;
+}
 
-  h3 {
-    font-size: 21px;
-  }
+#toc-main
+{
+    margin: 0.5em;
+}
 
-  h4 {
-    font-size: 18px;
-  }
+.code_container
+{
+}
 
-  h5 {
-    font-size: 14px;
-  }
+.cs
+{
+    background-color: #efeeef;
+}
 
-  h6 {
-    font-size: 12px;
-  }
 
-  code, pre {
-    min-width: 320px;
-    max-width: 480px;
-    font-size: 11px;
-  }
+/********************
+*   Mobile Styles   *
+********************/
+@media only screen and (max-width: 850px) {
 
+    /* header
+    ----------------------------------------------------------*/
+    header .float-left,
+    header .float-right {
+        float: none;
+    }
+
+    /* logo */
+    header .site-title {
+        margin: 10px;
+        text-align: center;
+    }
+
+    /* login */
+    #login {
+        font-size: .85em;
+        margin: 0 0 12px;
+        text-align: center;
+    }
+
+        #login ul {
+            margin: 5px 0;
+            padding: 0;
+        }
+
+        #login li {
+            display: inline;
+            list-style: none;
+            margin: 0;
+            padding: 0;
+        }
+
+        #login a {
+            background: none;
+            color: #999;
+            font-weight: 600;
+            margin: 2px;
+            padding: 0;
+        }
+
+        #login a:hover {
+            color: #333;
+        }
+
+    /* menu */
+    nav {
+        margin-bottom: 5px;
+    }
+
+    ul#menu {
+        margin: 0;
+        padding: 0;
+        text-align: center;
+    }
+
+        ul#menu li {
+            margin: 0;
+            padding: 0;
+        }
+
+
+    /* main layout
+    ----------------------------------------------------------*/
+    .main-content,
+    .featured + .main-content {
+        background-position: 10px 0;
+    }
+
+    .content-wrapper {
+        padding-right: 10px;
+        padding-left: 10px;
+    }
+
+    .featured .content-wrapper {
+        padding: 10px;
+    }
+
+    /* page content */
+    article, aside {
+        float: none;
+        width: 100%;
+    }
+
+    /* ordered list */
+    ol.round {
+        list-style-type: none;
+        padding-left: 0;
+    }
+
+        ol.round li {
+            padding-left: 10px;
+            margin: 25px 0;
+        }
+
+            ol.round li.zero,
+            ol.round li.one,
+            ol.round li.two,
+            ol.round li.three,
+            ol.round li.four,
+            ol.round li.five,
+            ol.round li.six,
+            ol.round li.seven,
+            ol.round li.eight,
+            ol.round li.nine {
+                background: none;
+            }
+
+     /* features */
+     section.feature {
+        float: none;
+        padding: 10px;
+        width: auto;
+     }
+
+        section.feature img {
+            color: #999;
+            content: attr(alt);
+            font-size: 1.5em;
+            font-weight: 600;
+        }
+
+    /* forms */
+    fieldset input[type="text"],
+    fieldset input[type="password"] {
+        width: 90%;
+    }
+
+    /* login page */
+    #loginForm {
+        border-right: none;
+        float: none;
+        width: auto;
+    }
+
+        #loginForm .validation-error {
+            display: block;
+            margin-left: 15px;
+        }
+
+    #socialLoginForm {
+        margin-left: 0;
+        float: none;
+        width: auto;
+    }
+
+    /* footer
+    ----------------------------------------------------------*/
+    footer .float-left,
+    footer .float-right {
+        float: none;
+    }
+
+    footer {
+        text-align: center;
+        height: auto;
+        padding: 10px 0;
+    }
+
+        footer p {
+            margin: 0;
+        }
+
+        ul#social {
+            padding: 0;
+            margin: 0;
+        }
+
+        a.facebook, a.twitter {
+            background: none;
+            display: inline;
+            float: none;
+            padding-left: 0;
+            text-indent: 0;
+        }
 }
diff --git a/samples/MvcWebApiSiteTest/Controllers/CustomerController.cs b/samples/MvcWebApiSiteTest/Controllers/CustomerController.cs
index 4f002ce..a849526 100644
--- a/samples/MvcWebApiSiteTest/Controllers/CustomerController.cs
+++ b/samples/MvcWebApiSiteTest/Controllers/CustomerController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Web.Http;
+using WebApiContrib.Formatting.Html;
 
 namespace MvcWebApiSiteTest.Controllers
 {
diff --git a/samples/MvcWebApiSiteTest/Views/Customer.cshtml b/samples/MvcWebApiSiteTest/Views/Customer.cshtml
index 53ffeba..b649f45 100644
--- a/samples/MvcWebApiSiteTest/Views/Customer.cshtml
+++ b/samples/MvcWebApiSiteTest/Views/Customer.cshtml
@@ -1,6 +1,37 @@
 ﻿@{
-    _Layout = "~/Views/Shared/_Layout.cshtml";
+	_Layout = "~/Views/Shared/_Layout.cshtml";
 }
+@section featured {
+    <section class="featured">
+        <div class="content-wrapper">
+         
+            <div>
+               <hgroup class="title">
+                <h2>ASP.Net Web API using HtmlMediaTypeFormater and RazorEngine</h2>
+            </hgroup>
+            <p>
+                By using the HtmlMediaTypeViewFormatter and the Razor view parser, it's now possible to use ASP.Net Web API to render a model as HTML by using Razor.
+
+                This site will demonstrate the use of the formatter and the Razor parser.
+            </p>
+        </div>
+    </section>
+}
+
+@section contentMenu {
+                                <li>                <a href="#Quick_overview">Quick overview</a>
+                            <ol><li>                <a href="#Finding_a_Package">Finding a Package</a>
+                            </li><li>                <a href="#Package_Sources">Package Sources</a>
+                            </li><li>                <a href="#Installing_a_Package">Installing a Package</a>
+                            </li><li>                <a href="#Removing_a_Package">Removing a Package</a>
+                            </li><li>                <a href="#Updating_a_Package">Updating a Package</a>
+                                 </li></ol></li><li> <a href="#How_the_View_locator_works">How_the_View_locator_works</a>
+                            <ol><li>                <a href="#Using_convention">Using convention</a>
+                            </li><li>                <a href="#Using_configuration">Using configuration</a>
+                            </li><li>                <a href="#Updating_Packages">Updating Packages</a>
+                            </li></ol></li>
+}
+
         <script src="http://ajax.aspnetcdn.com/ajax/jquery/jquery-1.5.1.min.js" type="text/javascript"></script>
 
         <div id="body">
diff --git a/samples/MvcWebApiSiteTest/Views/CustomerViaAttrib.cshtml b/samples/MvcWebApiSiteTest/Views/CustomerViaAttrib.cshtml
index 7ea4f0d..18dd32a 100644
--- a/samples/MvcWebApiSiteTest/Views/CustomerViaAttrib.cshtml
+++ b/samples/MvcWebApiSiteTest/Views/CustomerViaAttrib.cshtml
@@ -1,4 +1,8 @@
-﻿<!DOCTYPE html>
+﻿@{
+	_Layout = "~/Views/Shared/_Layout.cshtml";
+}
+
+<!DOCTYPE html>
 <html>
     
     <head>
diff --git a/samples/MvcWebApiSiteTest/Views/Index.cshtml b/samples/MvcWebApiSiteTest/Views/Index.cshtml
index 305a25a..b14d5ab 100644
--- a/samples/MvcWebApiSiteTest/Views/Index.cshtml
+++ b/samples/MvcWebApiSiteTest/Views/Index.cshtml
@@ -1,62 +1,137 @@
-﻿
-<!DOCTYPE html>
-<html>
-
-  <head>
-    <meta charset='utf-8' />
-    <meta http-equiv="X-UA-Compatible" content="chrome=1" />
-    <meta name="description" content="WebApiContrib : Community Contributions for ASP.NET Web API" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="/Content/Site.css">
-
-    <title>WebApiContrib</title>
-  </head>
-
-  <body>
-
-    <!-- HEADER -->
-    <div id="header_wrap" class="outer">
-        <header class="inner">
-          <a id="forkme_banner" href="https://github.com/WebApiContrib/WebAPIContrib">Fork Me on GitHub</a>
-
-          <h1 id="project_title">WebApiContrib</h1>
-          <h2 id="project_tagline">Community Contributions for ASP.NET Web API</h2>
-
-          <section id="downloads">
-            <a class="zip_download_link" href="https://github.com/WebApiContrib/WebAPIContrib/zipball/master">Download this project as a .zip file</a>
-            <a class="tar_download_link" href="https://github.com/WebApiContrib/WebAPIContrib/tarball/master">Download this project as a tar.gz file</a>
-          </section>
-        </header>
-    </div>
-
-    <!-- MAIN CONTENT -->
-    <div id="main_content_wrap" class="outer">
-      <section id="main_content" class="inner">
-        <h3>WebApiContrib</h3>
-
-<p>WebApiContrib is a collection of projects and samples built by the community for to enhance and improve the <a href="http://www.asp.net/web-api">ASP.NET Web API framework.</a></p>
-
-<p>More information will be coming very soon!</p>
-      </section>
-    </div>
-
-    <!-- FOOTER  -->
-    <div id="footer_wrap" class="outer">
-      <footer class="inner">
-        <p class="copyright">WebApiContrib maintained by <a href="https://github.com/WebApiContrib">WebApiContrib</a></p>
-        <p>Published with <a href="http://pages.github.com">GitHub Pages</a></p>
-      </footer>
-    </div>
-
-	<script type="text/javascript">
-	    var _gaq = _gaq || [];
-	    _gaq.push(['_setAccount', 'UA-30452127-1']);
-	    _gaq.push(['_trackPageview']);
-	    (function () {
-	        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-	        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-	        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	    })();
-	</script>
-  </body>
-</html>
\ No newline at end of file
+﻿@{
+	_Layout = "~/Views/Shared/_Layout.cshtml";
+}
+
+@section featured {
+    <section class="featured">
+        <div class="content-wrapper">
+         
+            <div>
+               <hgroup class="title">
+                <h2>ASP.Net Web API using HtmlMediaTypeFormater and RazorEngine</h2>
+            </hgroup>
+            <p>
+                By using the HtmlMediaTypeViewFormatter and the Razor view parser, it's now possible to use ASP.Net Web API to render a model as HTML by using Razor.
+
+                This site will demonstrate the use of the formatter and the Razor parser.
+            </p>
+        </div>
+    </section>
+}
+
+@section contentMenu {
+                                <li>                <a href="#Quick_overview">Quick overview</a></li>
+                                <li>                <a href="#Install_packages">Install Packages</a></li>
+                                <li> <a href="#How_the_View_locator_works">How the View locator works</a>
+                            <ol><li>                <a href="#Using_convention">Using convention</a>
+                            </li><li>                <a href="#Using_configuration">Using annotation</a>
+                            </li><li>                <a href="#Using_convention">Using configuration</a>
+                            </li></ol></li>
+}
+
+
+<h3 id="Quick_overview">1 Quick overview</h3>
+
+<p>Before we dive into the details, here is a simple example of using the HtmlMediaTypeViewFormatter with Razor:</p>
+<pre class="cs">
+    <code>
+    public class CustomerController : ApiController
+    {
+        public Customer Get()
+        {
+            return new Customer { Name = "John Doe", Country = "Country" };
+        }
+    }
+</code>
+</pre>
+<p>
+This controller will simply return a Customer as JSON or XAML based on the "Accept" or "content-type" header.
+</p>
+<p>
+    By adding the HtmlMediaTypeViewFormatter to the global.asax and using the RazorViewLocator and a RazorViewParser the code can also render the model as HTML by using a View. By deafult the view tried to be located
+    is "Customer.cshtml" or "Customer.vbhtml", based on the name of the model returned.
+</p>
+<pre class="cs">
+    <code>
+    protected void Application_Start()
+    {
+        //...
+
+        GlobalConfiguration.Configuration.Formatters.Add(new HtmlMediaTypeViewFormatter());
+        
+        GlobalViews.DefaultViewParser = new RazorViewParser();
+        GlobalViews.DefaultViewLocator = new RazorViewLocator();
+        
+        //...
+    }
+</code>
+</pre>
+<p>
+Customer.cshtml located in the "~/Views" folder of the web project
+</p>
+<pre class="html">
+    <code>
+    &lt;html&gt;Hello &#64;Model.Name! Welcome to Razor!&lt;/html&gt;
+</code>
+</pre>
+
+<h3 id="Install_packages">2 Install packages</h3>
+<p>To be updated....</p>
+
+<h3 id="How_the_View_locator_works">3 How the View locator works</h3>
+<p>
+    The razor view locator (RazorViewLocator) vill try to locate a view by using either, convention, annotation, configuration or by returning a View.
+    The views must be located in the follwoing folders:<pre>
+<code>
+    ~\Views
+    ~\Views\Shared
+</code></pre>
+<p>
+    The "~" is the root folder of the web application. Both .cshtml and .vbhtml are supported.
+</p>
+<p>
+    <i>Note: There is no way to specify another paths at this moment, it's easy to implement a view locator. It's done by implementing the IViewLocator interface located in the WebApiContrib.Formatting.Html assembly.</i>
+</p>
+
+<h3 id="Using_convention">3.1 Using convention</h3>
+<p>
+    By default the RazorViewLocator will locate a view by convention, it will try to find a view by the name of the model returned by the ApiController's methods.
+    The following code will try to find a view with the name "Customer" in the "Views" or "Views\Shared" folder and use it to render the returnd Customer model:
+    <pre class="C#"><code>
+    public class CustomerController : ApiController
+    {
+        public Customer Get()
+        {
+            return new Customer { Name = "John Doe", Country = "Country" };
+        }
+    }
+</code></pre>
+    To use the ApiController to render the Customer model with the Customer view, just use the following path in browser:</p>
+    <p>
+    <a href="/Customer">http://localhost/mysite/customer</a>
+    </p> 
+
+<h3 id="Using_annotation">3.2 Using annotation</h3>
+<p>
+    A view could be specified for a specific mode by adding the ViewAttribute to the model returned by a ApiController method.
+</p>
+    <pre class="c#"><code>
+    public class CustomerController : ApiController
+    {
+        public Customer Get()
+        {
+            return new Customer { Name = "John Doe", Country = "Country" };
+        }
+    }
+        
+    [View("CustomerViaAttrib")]
+    public class Customer
+    {
+        public string Name { get; set; }
+
+        public string Country { get; set; }
+    }
+</code></pre>
+    <p>
+    This code will try to locate a view with the name "CustomerViaAttrib".
+    </p>
\ No newline at end of file
diff --git a/samples/MvcWebApiSiteTest/Views/Shared/_Layout.cshtml b/samples/MvcWebApiSiteTest/Views/Shared/_Layout.cshtml
index 760f07a..1b266d2 100644
--- a/samples/MvcWebApiSiteTest/Views/Shared/_Layout.cshtml
+++ b/samples/MvcWebApiSiteTest/Views/Shared/_Layout.cshtml
@@ -1,10 +1,68 @@
-﻿<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width" />
-</head>
-<body>
-    @RenderBody()
-</body>
-</html>
+﻿<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>ASP.Net Web API - Razor</title>
+        <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+        <meta name="viewport" content="width=device-width" />
+        <link href="/Content/Site.css" rel="stylesheet" />
+    </head>
+    <body>
+        <header>
+            <div class="content-wrapper">
+                <div class="float-left">
+                    <p class="site-title">ASP.Net Web API - Razor</p>
+                </div>
+                <div class="float-right">
+                    <nav>
+                        <ul id="menu">
+                            <li>Home</li>
+                            <li>About</li>
+                            <li>Contact</li>
+                        </ul>
+                    </nav>
+                </div>
+            </div>
+        </header>
+        <div id="body">
+
+            <section class="featured">
+                @RenderSection("featured")
+            </section>
+        
+            <section class="content-wrapper main-content clear-fix">
+                
+                 <aside id="toc">
+                    <div id="toc-main">
+                        <h3 id="toc-heading">Content</h3>
+                        <ol id="toc-body">
+                            @RenderSection("contentMenu")
+                        </ol>
+                    </div>
+                </aside>
+
+                @RenderBody()
+
+            </section>
+
+        </div>
+        <footer>
+            <div class="content-wrapper">
+                <div class="float-left">
+                    <p>&copy; @DateTime.Now.Year - .Net Guides</p>
+                </div>
+                <div class="float-right">
+                    <ul id="social">
+                        <li><a href="http://facebook.com" class="facebook">Facebook</a></li>
+                        <li><a href="http://twitter.com" class="twitter">Twitter</a></li>
+                    </ul>
+                </div>
+            </div>
+        </footer>
+
+        <link rel="stylesheet" href="http://yandex.st/highlightjs/7.0/styles/default.min.css">
+        <script src="http://yandex.st/highlightjs/7.0/highlight.min.js"></script>
+        <script>hljs.initHighlightingOnLoad();</script>
+        
+    </body>
+</html>
diff --git a/samples/MvcWebApiSiteTest/Web.config b/samples/MvcWebApiSiteTest/Web.config
index c8650d3..13fc167 100644
--- a/samples/MvcWebApiSiteTest/Web.config
+++ b/samples/MvcWebApiSiteTest/Web.config
@@ -1,95 +1,95 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<!--
-  For more information on how to configure your ASP.NET application, please visit
-  http://go.microsoft.com/fwlink/?LinkId=169433
-  -->
-<configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </configSections>
-  <connectionStrings>
-    <add name="DefaultConnection" providerName="System.Data.SqlClient" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=aspnet-MvcWebApiSiteTest-20120821092832;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|\aspnet-MvcWebApiSiteTest-20120821092832.mdf" />
-  </connectionStrings>
-  <appSettings>
-    <add key="webpages:Version" value="2.0.0.0" />
-    <add key="webpages:Enabled" value="false" />
-    <add key="PreserveLoginUrl" value="true" />
-    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-  </appSettings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0" />
-    <authentication mode="None" />
-    <pages>
-      <namespaces>
-        <add namespace="System.Web.Helpers" />
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Optimization" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.WebPages" />
-      </namespaces>
-    </pages>
-    <profile defaultProvider="DefaultProfileProvider">
-      <providers>
-        <add name="DefaultProfileProvider" type="System.Web.Providers.DefaultProfileProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </profile>
-    <membership defaultProvider="DefaultMembershipProvider">
-      <providers>
-        <add name="DefaultMembershipProvider" type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
-      </providers>
-    </membership>
-    <roleManager defaultProvider="DefaultRoleProvider">
-      <providers>
-        <add name="DefaultRoleProvider" type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </roleManager>
-    <sessionState mode="InProc" customProvider="DefaultSessionProvider">
-      <providers>
-        <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
-      </providers>
-    </sessionState>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true" />
-    <handlers>
-      <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
-      <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-      <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-    </handlers>
-  </system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="v11.0" />
-      </parameters>
-    </defaultConnectionFactory>
-  </entityFramework>
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+  For more information on how to configure your ASP.NET application, please visit
+  http://go.microsoft.com/fwlink/?LinkId=169433
+  -->
+<configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <connectionStrings>
+    <add name="DefaultConnection" providerName="System.Data.SqlClient" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=aspnet-MvcWebApiSiteTest-20120821092832;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|\aspnet-MvcWebApiSiteTest-20120821092832.mdf" />
+  </connectionStrings>
+  <appSettings>
+    <add key="webpages:Version" value="2.0.0.0" />
+    <add key="webpages:Enabled" value="false" />
+    <add key="PreserveLoginUrl" value="true" />
+    <add key="ClientValidationEnabled" value="true" />
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+  </appSettings>
+  <system.web>
+    <compilation debug="true" targetFramework="4.0" />
+    <authentication mode="None" />
+    <pages>
+      <namespaces>
+        <add namespace="System.Web.Helpers" />
+        <add namespace="System.Web.Mvc" />
+        <add namespace="System.Web.Mvc.Ajax" />
+        <add namespace="System.Web.Mvc.Html" />
+        <add namespace="System.Web.Optimization" />
+        <add namespace="System.Web.Routing" />
+        <add namespace="System.Web.WebPages" />
+      </namespaces>
+    </pages>
+    <profile defaultProvider="DefaultProfileProvider">
+      <providers>
+        <add name="DefaultProfileProvider" type="System.Web.Providers.DefaultProfileProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
+      </providers>
+    </profile>
+    <membership defaultProvider="DefaultMembershipProvider">
+      <providers>
+        <add name="DefaultMembershipProvider" type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="DefaultRoleProvider">
+      <providers>
+        <add name="DefaultRoleProvider" type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
+      </providers>
+    </roleManager>
+    <sessionState mode="InProc" customProvider="DefaultSessionProvider">
+      <providers>
+        <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
+      </providers>
+    </sessionState>
+  </system.web>
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules runAllManagedModulesForAllRequests="true" />
+    <handlers>
+      <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
+      <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+      <add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+      <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+    </handlers>
+  </system.webServer>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <!--<dependentAssembly>
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>-->
+    </assemblyBinding>
+  </runtime>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="v11.0" />
+      </parameters>
+    </defaultConnectionFactory>
+  </entityFramework>
 </configuration>
\ No newline at end of file
diff --git a/src/WebApiContrib.Formatting.Razor/RazorViewParser.cs b/src/WebApiContrib.Formatting.Razor/RazorViewParser.cs
index 48d0440..5f18a3a 100644
--- a/src/WebApiContrib.Formatting.Razor/RazorViewParser.cs
+++ b/src/WebApiContrib.Formatting.Razor/RazorViewParser.cs
@@ -9,9 +9,17 @@ namespace WebApiContrib.Formatting.Razor
 {
     public class RazorViewParser : IViewParser
     {
-        private readonly ITemplateService _templateService;
+        private ITemplateService _templateService;
 
-		public RazorViewParser(ITemplateService templateService)
+
+        public RazorViewParser()
+        {
+            //var config = new TemplateServiceConfiguration { Resolver = new TemplateResolver() };
+            //_templateService = new TemplateService(config);
+        }
+
+        
+        public RazorViewParser(ITemplateService templateService)
 		{
 			if (templateService == null)
 				throw new ArgumentNullException("templateService");
@@ -19,12 +27,6 @@ public RazorViewParser(ITemplateService templateService)
 			_templateService = templateService;
 		}
 
-        public RazorViewParser()
-        {
-            var config = new TemplateServiceConfiguration { Resolver = new TemplateResolver() };
-            _templateService = new TemplateService(config);
-        }
-
 
         public RazorViewParser(ITemplateResolver resolver)
 		{
@@ -45,14 +47,40 @@ public byte[] ParseView(IView view, string viewTemplate, System.Text.Encoding en
 
         private string GetParsedView(IView view, string viewTemplate)
         {
+            var implicitSetWorkaround = false;
+            
+            // 1* THIS IF STATEMENT IS ONLY ADDED AS A TEMPORARY WORKAROUND
+            // There is probably a bug in the RazorEngine when trying to set the Model property of a template
+            // next time this code runs.
+            // A new instance need to be created, I think it has to do with a cache the TemplateService uses.
+            if (_templateService == null)
+            {
+                var config = new TemplateServiceConfiguration {Resolver = new TemplateResolver()};
+                _templateService = new TemplateService(config);
+
+                implicitSetWorkaround = true;
+            }
+
+
+
+            string result = string.Empty;
+
             if (view.ModelType == null)
             {
                 _templateService.Compile(viewTemplate, view.ViewName);
-                return _templateService.Run(view.ViewName);
+                result = _templateService.Run(view.ViewName);
             }
+            else
+            {
+                _templateService.Compile(viewTemplate, view.ModelType, view.ViewName);
+                result = _templateService.Run(view.ViewName, view.Model);
+            }
+
+            // Workaround to solve a bug, see comment 1* above.
+            if (implicitSetWorkaround)
+                _templateService = null;
 
-            _templateService.Compile(viewTemplate, view.ModelType, view.ViewName);
-            return _templateService.Run(view.ViewName, view.Model);
+            return result;
         }
     }
 }
