Updated to work with ASP.NET WebApi 2