oops

add a timeout

README.md

@@ -69,7 +69,7 @@ For Authenticated requests:
 
 ```csharp
 
-var ts = new AuthenticatedUntappdCredentials("token", "key", "secret");
+var ts = new AuthenticatedUntappdCredentials("token");
 var t = new Repository().Get<ActivityFeed>(ts);
 
 ```
@@ -79,7 +79,7 @@ For Actions (usually post requests). Note: Actions return a dynamic object. Usua
 
 ```csharp
 
-var ts = new AuthenticatedUntappdCredentials("token", "key", "secret");
+var ts = new AuthenticatedUntappdCredentials("token");
 var checkin = new CheckIn("-5", "EST", 1044097) { Shout = "Awesome Brew", Rating = 4 };
 var response = repository.Post(ts, checkin);
 
@@ -96,3 +96,4 @@ var response = repository.Post(ts, checkin);
 Current contributors:
 * Tommy James Parnell (https://github.com/tparnell8)
 * Rodrigo P Reis (https://github.com/rodkings)
+

Rakefile

@@ -25,7 +25,7 @@ task :lint => [:build, :cs_lint]
 
 desc 'Retrieve, Build, Test'
 task :preflight => [:clean, :retrieve, :build, :test, :lint]
-
+throw "oops"
 desc 'cleans up artifacts'
 task :clean do
   puts 'cleaning artifacts from directory'

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.4.{build}
+version: 0.5.{build}
 configuration: Release
 notifications:
 - provider: Webhook

assets/tools.rake

@@ -1,5 +1,8 @@
+require 'openssl'
+
 namespace :tools do
 
+	# If we don't have a copy of nuget, download it
 	# If we don't have a copy of nuget, download it
 		task :nuget_bootstrap do
 			puts 'Ensuring NuGet exists in tools/NuGet'
@@ -10,12 +13,12 @@ namespace :tools do
 				begin
 				FileUtils.mkdir_p("#{NUGET}")
 				File.open("#{NUGET}/nuget.exe", "wb") do |file|
-				file.write open('https://nuget.org/nuget.exe').read
+					file.write open('http://nuget.org/nuget.exe', {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).read
 				end
 			rescue
 				FileUtils.rm_rf("#{NUGET}/nuget.exe")
 				File.open("#{NUGET}/nuget.exe", "wb") do |file|
-				file.write open('http://nuget.org/nuget.exe').read
+					file.write open('https://nuget.org/nuget.exe', {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).read
 				end
 			end
 			end

src/Untappd.Net.UnitTests/Authentication/TestAuthenticatedUntappdCredentials.cs

@@ -13,6 +13,7 @@ namespace Untappd.Net.UnitTests.Authentication
 		{
 			var t = new AuthenticatedUntappdCredentials(null);
 		}
+
 		[Test]
 		public void ExpectValid()
 		{

src/Untappd.Net.UnitTests/Authentication/TestAuthenticationHelper.cs

@@ -12,53 +12,49 @@ namespace Untappd.Net.UnitTests.Authentication
 		[ExpectedException(typeof(ArgumentNullException))]
 		public void TestRedirectUserToException1()
 		{
-
 			AuthenticationHelper.RedirectUserTo(null, "url");
 		}
+
 		[Test]
 		[ExpectedException(typeof(ArgumentNullException))]
 		public void TestRedirectUserToException2()
 		{
-
 			AuthenticationHelper.RedirectUserTo(new UnAuthenticatedUntappdCredentials("d", "d"), string.Empty);
 		}
+
 		[Test]
 		[ExpectedException(typeof(ArgumentNullException))]
 		public void TestTokenUrlException1()
 		{
-
 			AuthenticationHelper.TokenUrl(null, "some", "code");
 		}
+
 		[Test]
 		[ExpectedException(typeof(ArgumentNullException))]
 		public void TestTokenUrlException2()
 		{
-
 			AuthenticationHelper.TokenUrl(new UnAuthenticatedUntappdCredentials("d", "d"), string.Empty, "code");
 		}
+
 		[Test]
 		[ExpectedException(typeof(ArgumentNullException))]
 		public void TestTokenUrlException3()
 		{
-
 			AuthenticationHelper.TokenUrl(new UnAuthenticatedUntappdCredentials("d", "d"), "ds", string.Empty);
 		}
 
 		[Test]
 		public void TestTokenUrl()
 		{
-
 			var s = AuthenticationHelper.TokenUrl(new UnAuthenticatedUntappdCredentials("d", "d"), "ds", "code");
 			Assert.AreEqual(s, Constants.OAuthTokenEndPoint + "/?client_id=d&client_secret=d&response_type=code&redirect_url=ds&code=code");
-
 		}
+
 		[Test]
 		public void TestRedirectUrl()
 		{
-
 			var s = AuthenticationHelper.RedirectUserTo(new UnAuthenticatedUntappdCredentials("d", "d"), "ds");
 			Assert.AreEqual(s, Constants.BaseRequestString + "/?client_id=d&response_type=code&redirect_url=ds");
-
 		}
 	}
 }

src/Untappd.Net.UnitTests/Authentication/TestUnAuthenticatedUntappdCredentials.cs

@@ -13,6 +13,7 @@ namespace Untappd.Net.UnitTests.Authentication
 		{
 			var t = new UnAuthenticatedUntappdCredentials(string.Empty, "t");
 		}
+
 		[Test]
 		[ExpectedException(typeof(ArgumentNullException))]
 		public void ExpectClientSecretException()

src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs

@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using Untappd.Net.Exception;
+
 namespace Untappd.Net.UnitTests.Exception
 {
 	[TestFixture]
@@ -11,19 +12,19 @@ namespace Untappd.Net.UnitTests.Exception
 		{
 			throw new BaseUntappdException();
 		}
+
 		[ExpectedException(typeof(BaseUntappdException), ExpectedMessage = "messageHere")]
 		[Test]
 		public void TestStandardExceptionWithMessage()
 		{
 			throw new BaseUntappdException("messageHere");
 		}
+
 		[ExpectedException(typeof(BaseUntappdException), ExpectedMessage = "messageHere")]
 		[Test]
 		public void TestStandardExceptionWithInner()
 		{
 			throw new BaseUntappdException("messageHere", new System.Exception("innerException!"));
 		}
-
-
 	}
 }

src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs

@@ -12,6 +12,5 @@ namespace Untappd.Net.UnitTests.Exception
 		{
 			throw new EndpointConfigurationException();
 		}
-
 	}
 }

src/Untappd.Net.UnitTests/Exception/TestHttpErrorException.cs

@@ -1,9 +1,8 @@
 using System;
-using NUnit.Framework;
-using Untappd.Net.Exception;
 using Moq;
+using NUnit.Framework;
 using RestSharp;
-
+using Untappd.Net.Exception;
 
 namespace Untappd.Net.UnitTests.Exception
 {
@@ -16,17 +15,16 @@ namespace Untappd.Net.UnitTests.Exception
 			var mockRequest = new Mock<IRestRequest>();
 			var mockResponse = new Mock<IRestResponse>();
 
-            Assert.Throws<ArgumentNullException>(()=>{
+			Assert.Throws<ArgumentNullException>(() =>
+			{
 				var t = new HttpErrorException(mockRequest.Object, null);
 				Console.WriteLine(t);
-
 			});
-            Assert.Throws<ArgumentNullException>(()=>{
+			Assert.Throws<ArgumentNullException>(() =>
+			{
 				var t = new HttpErrorException(null, mockResponse.Object);
 				Console.WriteLine(t);
-
 			});
 		}
 	}
 }
-

src/Untappd.Net.UnitTests/Request/TestRepository.cs

@@ -6,10 +6,10 @@ using Moq;
 using NUnit.Framework;
 using RestSharp;
 using Untappd.Net.Authentication;
+using Untappd.Net.Exception;
 using Untappd.Net.Request;
 using Untappd.Net.Responses.Actions;
 using Untappd.Net.Responses.BeerInfo;
-using Untappd.Net.Exception;
 
 namespace Untappd.Net.UnitTests.Request
 {
@@ -39,7 +39,9 @@ namespace Untappd.Net.UnitTests.Request
 			client.Setup(a => a.ExecuteTaskAsync(It.IsAny<IRestRequest>())).Callback(() =>
 			{
 			}).Returns(Task.Run(() => response.Object));
+#pragma warning disable CS0618 // Type or member is obsolete Using as intended
 			var repository = new Repository(client.Object, request.Object);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			repository.Get<BeerInfo>(mockCreds.Object, "awesome", bodyParam);
 			request.Verify(a => a.AddParameter("client_id", mockCreds.Object.AuthenticationData["client_id"]));
@@ -94,6 +96,15 @@ namespace Untappd.Net.UnitTests.Request
 			Assert.IsTrue(constructorTest.Client != null);
 			Assert.IsTrue(constructorTest.Request != null);
 		}
+
+		[Test]
+		public void TimeoutShouldGetPassedIn()
+		{
+			var timeout = 100;
+			var repo = new Repository(timeout: timeout);
+			Assert.AreEqual(repo.Request.Timeout, timeout);
+		}
+
 		[Test]
 		public void ConfirmConfigureGetRequestClearsParams()
 		{

src/Untappd.Net.UnitTests/Responses/Actions/TestCheckInAction.cs

@@ -52,10 +52,6 @@ namespace Untappd.Net.UnitTests.Responses.Actions
 			checkin.Rating = 2;
 			Assert.IsTrue(checkin.BodyParameters.ContainsKey("rating"));
 			Assert.AreEqual(checkin.BodyParameters["rating"], 2);
-
-
-
-        }
-
+		}
 	}
 }

src/Untappd.Net.UnitTests/Responses/Actions/TestSimpleActions.cs

@@ -35,7 +35,6 @@ namespace Untappd.Net.UnitTests.Responses.Actions
 			Assert.IsNotNullOrEmpty(removeWish.EndPoint);
 			Assert.AreEqual(removeWish.BodyParameters["bid"], 1);
 
-
 			var addWish = new AddToWishList(1);
 			Assert.IsNotNullOrEmpty(addWish.RequestMethod.ToString());
 			Assert.IsNotNullOrEmpty(addWish.EndPoint);

src/Untappd.Net.UnitTests/Responses/TestResponseEndpoints.cs

@@ -9,7 +9,6 @@ namespace Untappd.Net.UnitTests.Responses
 	[TestFixture]
 	public class TestResponseEndpoints
 	{
-
 		/// <summary>
 		/// Run through all the endpoints to make sure they all atleast do not error out.
 		/// This is so we can get a high code coverage, while also covering new types that get added.
@@ -17,17 +16,16 @@ namespace Untappd.Net.UnitTests.Responses
 		[Test]
 		public void RunAllEndpoints()
 		{
-
 			var objects = Assembly.GetAssembly(typeof(IRequest)).GetTypes().Where(myType =>
 			   myType.IsClass
 			   && !myType.IsAbstract
 			   && myType.GetInterface("IRequest") != null).Select(type => (IRequest)Activator.CreateInstance(type)).ToList();
 			objects.ForEach(a => Assert.IsNotNullOrEmpty(a.EndPoint("t")));
 		}
+
 		[Test]
 		public void RunAllEndpointsWithEmptyString()
 		{
-
 			var objects = Assembly.GetAssembly(typeof(IRequest)).GetTypes().Where(myType =>
 			   myType.IsClass
 			   && !myType.IsAbstract

src/Untappd.Net/Authentication/IUnAuthenticatedUntappdCredentials.cs

@@ -1,5 +1,4 @@
-
-namespace Untappd.Net.Authentication
+namespace Untappd.Net.Authentication
 {
 	public interface IUnAuthenticatedUntappdCredentials : IUntappdCredentials
 	{

src/Untappd.Net/Exception/EndpointConfigurationException.cs

@@ -12,7 +12,6 @@ namespace Untappd.Net.Exception
 		public EndpointConfigurationException()
 			: base("Invalid endpoint configured")
 		{
-            
 		}
 	}
 }

src/Untappd.Net/Exception/HttpErrorException.cs

@@ -16,6 +16,7 @@ namespace Untappd.Net.Exception
 		}
 
 		private readonly string _message;
+
 		public HttpErrorException(IRestRequest request, IRestResponse response)
 		{
 			if (request == null)

src/Untappd.Net/Properties/AssemblyInfo.cs

@@ -1,12 +1,10 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 using System;
-
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Untappd.Net")]
 [assembly: AssemblyDescription("C# Untappd Wrapper")]

src/Untappd.Net/Request/BasicRequest.cs

@@ -5,6 +5,7 @@ namespace Untappd.Net.Request
 	public abstract class BasicRequest
 	{
 		protected abstract string EndPointWithConfiguration { get; }
+
 		/// <summary>
 		/// Pass in the parameter into the request...ie username, brewery, etc.
 		/// </summary>

src/Untappd.Net/Request/Repository.cs

@@ -14,6 +14,7 @@ namespace Untappd.Net.Request
         internal IRestClient Client;
         internal IRestRequest Request;
         public bool FailFast { get; set; }
+
         /// <summary>
         /// Event to listen to when failFast is set to false
         /// This allows you to capture the excpetion, before its swallowed
@@ -24,10 +25,14 @@ namespace Untappd.Net.Request
         /// Make a repository
         /// </summary>
         /// <param name="failFast">Should we throw exceptions? or just return null</param>
-        public Repository(bool failFast = true)
+        /// <param name="timeout">Set a timeout in milliseconds</param>
+        public Repository(bool failFast = true, int timeout = 0)
         {
             Client = new RestClient(Constants.BaseRequestString);
-            Request = new RestRequest();
+            Request = new RestRequest
+            {
+                Timeout = timeout
+            };
             FailFast = failFast;
         }
 
@@ -65,19 +70,19 @@ namespace Untappd.Net.Request
             return this;
         }
 
-        TResult ExecuteRequest<TResult>()
+        private TResult ExecuteRequest<TResult>()
             where TResult : class
         {
             return ProcessExecution<TResult>(Client.Execute(Request));
         }
 
-        async Task<TResult> ExecuteRequestAsync<TResult>()
+        private async Task<TResult> ExecuteRequestAsync<TResult>()
             where TResult : class
         {
             return ProcessExecution<TResult>(await Client.ExecuteTaskAsync(Request));
         }
 
-        TResult ProcessExecution<TResult>(IRestResponse response)
+        private TResult ProcessExecution<TResult>(IRestResponse response)
             where TResult : class
         {
             //if the return type is not 200 throw errors

src/Untappd.Net/Request/RepositoryGet.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Untappd.Net.Authentication;
-using Untappd.Net.Exception;
 
 namespace Untappd.Net.Request
 {

src/Untappd.Net/Request/RepositoryPost.cs

@@ -1,6 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Untappd.Net.Authentication;
-using System;
 
 namespace Untappd.Net.Request
 {

src/Untappd.Net/Responses/Actions/AcceptFriend.cs

@@ -10,6 +10,7 @@ namespace Untappd.Net.Responses.Actions
 		public Method RequestMethod { get { return Method.GET; } }
 		public string EndPoint { get; private set; }
 		public IDictionary<string, object> BodyParameters { get { return new Dictionary<string, object>(); } }
+
 		public AcceptFriend(string target_id)
 		{
 			if (string.IsNullOrWhiteSpace(target_id))

src/Untappd.Net/Responses/Actions/AddComment.cs

@@ -10,6 +10,7 @@ namespace Untappd.Net.Responses.Actions
 		public Method RequestMethod { get { return Method.POST; } }
 		public string EndPoint { get; private set; }
 		public IDictionary<string, object> BodyParameters { get; private set; }
+
 		public AddComment(string checkinId, string shout)
 		{
 			if (string.IsNullOrWhiteSpace(checkinId))
@@ -26,7 +27,6 @@ namespace Untappd.Net.Responses.Actions
 			}
 			EndPoint = string.Format("v4/checkin/addcomment/{0}", checkinId);
 			BodyParameters = new Dictionary<string, object> { { shout, shout } };
-
 		}
 	}
 }

src/Untappd.Net/Responses/Actions/AddFriend.cs

@@ -10,6 +10,7 @@ namespace Untappd.Net.Responses.Actions
 		public Method RequestMethod { get { return Method.GET; } }
 		public string EndPoint { get; private set; }
 		public IDictionary<string, object> BodyParameters { get { return new Dictionary<string, object>(); } }
+
 		public AddFriend(string target_id)
 		{
 			if (string.IsNullOrWhiteSpace(target_id))

src/Untappd.Net/Responses/Actions/AddToWishList.cs

@@ -9,10 +9,10 @@ namespace Untappd.Net.Responses.Actions
 		public Method RequestMethod { get { return Method.GET; } }
 		public string EndPoint { get { return "v4/user/wishlist/add"; } }
 		public IDictionary<string, object> BodyParameters { get; private set; }
+
 		public AddToWishList(int beerId)
 		{
 			BodyParameters = new Dictionary<string, object>() { { "bid", beerId } };
-
 		}
 	}
 }

src/Untappd.Net/Responses/Actions/CheckIn.cs

@@ -78,7 +78,6 @@ namespace Untappd.Net.Responses.Actions
 			}
 		}
 
-
 		public CheckIn(string gmtOffset, string timezone, int bid)
 		{
 			if (string.IsNullOrWhiteSpace(gmtOffset))

src/Untappd.Net/Responses/Actions/RemoveFriend.cs

@@ -10,6 +10,7 @@ namespace Untappd.Net.Responses.Actions
 		public Method RequestMethod { get { return Method.GET; } }
 		public string EndPoint { get; private set; }
 		public IDictionary<string, object> BodyParameters { get { return new Dictionary<string, object>(); } }
+
 		public RemoveFriend(string target_id)
 		{
 			if (string.IsNullOrWhiteSpace(target_id))

src/Untappd.Net/Responses/Actions/RemoveFromWishList.cs

@@ -9,10 +9,10 @@ namespace Untappd.Net.Responses.Actions
 		public Method RequestMethod { get { return Method.GET; } }
 		public string EndPoint { get { return "v4/user/wishlist/delete"; } }
 		public IDictionary<string, object> BodyParameters { get; private set; }
+
 		public RemoveFromWishList(int beerId)
 		{
 			BodyParameters = new Dictionary<string, object>() { { "bid", beerId } };
-
 		}
 	}
 }

src/Untappd.Net/Responses/Actions/ToastUntoast.cs

@@ -10,6 +10,7 @@ namespace Untappd.Net.Responses.Actions
 		public Method RequestMethod { get { return Method.POST; } }
 		public IDictionary<string, object> BodyParameters { get { return new Dictionary<string, object>(); } }
 		public string EndPoint { get; private set; }
+
 		/// <summary>
 		///
 		/// </summary>

src/Untappd.Net/Responses/BeerInfo.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.BeerInfo
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Stats
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -85,7 +78,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Contact
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -98,7 +90,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -114,7 +105,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -137,7 +127,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Photo
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -153,7 +142,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Beer2
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -196,7 +184,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Contact2
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -209,7 +196,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Location2
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -225,7 +211,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Brewery2
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -254,7 +239,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class User
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -279,7 +263,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Item
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -307,7 +290,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Media
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -317,7 +299,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class User2
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -358,7 +339,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Beer3
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -401,7 +381,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Contact3
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -414,7 +393,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Location3
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -430,7 +408,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Brewery3
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -459,7 +436,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Comments
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -472,7 +448,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class User3
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -506,7 +481,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Item3
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -525,7 +499,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Toasts
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -541,7 +514,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Photo2
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -557,7 +529,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Item4
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -567,7 +538,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Media2
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -577,7 +547,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Source
 	{
-
 		[JsonProperty("app_name")]
 		public string AppName { get; set; }
 
@@ -587,7 +556,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class BadgeImage
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -600,7 +568,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Item5
 	{
-
 		[JsonProperty("badge_id")]
 		public int BadgeId { get; set; }
 
@@ -622,7 +589,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Badges
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -632,7 +598,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Item2
 	{
-
 		[JsonProperty("checkin_id")]
 		public int CheckinId { get; set; }
 
@@ -675,7 +640,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Checkins
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -685,7 +649,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Beer4
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -713,7 +676,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Contact4
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -729,7 +691,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Location4
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -745,7 +706,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Brewery4
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -774,7 +734,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Friends
 	{
-
 		[JsonProperty("items")]
 		public IList<object> Items { get; set; }
 
@@ -784,7 +743,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Item6
 	{
-
 		[JsonProperty("rating_score")]
 		public double RatingScore { get; set; }
 
@@ -800,7 +758,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Similar
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -810,7 +767,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Friends2
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -820,7 +776,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Beer5
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -842,14 +797,12 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Item7
 	{
-
 		[JsonProperty("beer")]
 		public Beer5 Beer { get; set; }
 	}
 
 	public class Vintages
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -859,7 +812,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -930,7 +882,6 @@ namespace Untappd.Net.Responses.BeerInfo
 
 	public class Response
 	{
-
 		[JsonProperty("beer")]
 		public Beer Beer { get; set; }
 	}

src/Untappd.Net/Responses/BeerSearch.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.BeerSearch
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -106,7 +99,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Contact
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -122,7 +114,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -138,7 +129,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -166,7 +156,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Item
 	{
-
 		[JsonProperty("checkin_count")]
 		public int CheckinCount { get; set; }
 
@@ -185,7 +174,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Beers
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -195,7 +183,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Homebrew
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -205,7 +192,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Breweries
 	{
-
 		[JsonProperty("items")]
 		public IList<object> Items { get; set; }
 
@@ -215,7 +201,6 @@ namespace Untappd.Net.Responses.BeerSearch
 
 	public class Response
 	{
-
 		[JsonProperty("message")]
 		public string Message { get; set; }
 

src/Untappd.Net/Responses/BreweryInfo.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.BreweryInfo
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class ClaimedStatus
 	{
-
 		[JsonProperty("is_claimed")]
 		public bool IsClaimed { get; set; }
 
@@ -91,7 +84,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Contact
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -107,7 +99,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_address")]
 		public string BreweryAddress { get; set; }
 
@@ -126,7 +117,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Rating
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -136,7 +126,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Stats
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -158,7 +147,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Owners
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -168,7 +156,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Photo
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -184,7 +171,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -209,7 +195,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Contact2
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -225,7 +210,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Location2
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -241,7 +225,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Brewery2
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -269,7 +252,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class User
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -294,7 +276,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Item
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -322,7 +303,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Media
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -332,7 +312,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class User2
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -372,7 +351,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Beer2
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -400,7 +378,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Contact3
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -416,7 +393,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Location3
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -432,7 +408,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Brewery3
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -460,7 +435,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Comments
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -473,7 +447,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class User3
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -507,7 +480,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Item3
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -526,7 +498,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Toasts
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -542,7 +513,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Photo2
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -558,7 +528,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Item4
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -568,7 +537,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Media2
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -578,7 +546,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Source
 	{
-
 		[JsonProperty("app_name")]
 		public string AppName { get; set; }
 
@@ -588,7 +555,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class BadgeImage
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -601,7 +567,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Item5
 	{
-
 		[JsonProperty("badge_id")]
 		public int BadgeId { get; set; }
 
@@ -623,7 +588,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Badges
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -633,7 +597,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Item2
 	{
-
 		[JsonProperty("checkin_id")]
 		public int CheckinId { get; set; }
 
@@ -676,7 +639,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Checkins
 	{
-
 		[JsonProperty("mem")]
 		public bool Mem { get; set; }
 
@@ -689,7 +651,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Beer3
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -735,7 +696,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Contact4
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -751,7 +711,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Location4
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -767,7 +726,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Brewery4
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -795,7 +753,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Item6
 	{
-
 		[JsonProperty("has_had")]
 		public bool HasHad { get; set; }
 
@@ -814,7 +771,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class BeerList
 	{
-
 		[JsonProperty("is_super")]
 		public bool IsSuper { get; set; }
 
@@ -836,7 +792,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -901,7 +856,6 @@ namespace Untappd.Net.Responses.BreweryInfo
 
 	public class Response
 	{
-
 		[JsonProperty("brewery")]
 		public Brewery Brewery { get; set; }
 	}

src/Untappd.Net/Responses/BrewerySearch.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.BrewerySearch
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.BrewerySearch
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.BrewerySearch
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.BrewerySearch
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.BrewerySearch
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.BrewerySearch
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -85,7 +78,6 @@ namespace Untappd.Net.Responses.BrewerySearch
 
 	public class Brewery2
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -107,14 +99,12 @@ namespace Untappd.Net.Responses.BrewerySearch
 
 	public class Item
 	{
-
 		[JsonProperty("brewery")]
 		public Brewery2 Brewery { get; set; }
 	}
 
 	public class Brewery
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -124,7 +114,6 @@ namespace Untappd.Net.Responses.BrewerySearch
 
 	public class Response
 	{
-
 		[JsonProperty("search_type")]
 		public string SearchType { get; set; }
 

src/Untappd.Net/Responses/Feeds/ActivityFeed.cs

@@ -6,7 +6,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 {
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -16,7 +15,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -26,7 +24,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -39,7 +36,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -58,7 +54,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -68,7 +63,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class User
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -102,7 +96,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -130,7 +123,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Contact
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -146,7 +138,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -162,7 +153,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -190,7 +180,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class User2
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -230,7 +219,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Item2
 	{
-
 		[JsonProperty("user")]
 		public User2 User { get; set; }
 
@@ -258,7 +246,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Comments
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -271,7 +258,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class User3
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -305,7 +291,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Item3
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -324,7 +309,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Toasts
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -340,7 +324,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Photo
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -356,7 +339,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Item4
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -366,7 +348,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Media
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -376,7 +357,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Source
 	{
-
 		[JsonProperty("app_name")]
 		public string AppName { get; set; }
 
@@ -386,7 +366,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class BadgeImage
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -399,7 +378,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Item5
 	{
-
 		[JsonProperty("badge_id")]
 		public int BadgeId { get; set; }
 
@@ -421,7 +399,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Badges
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -431,7 +408,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Item
 	{
-
 		[JsonProperty("checkin_id")]
 		public int CheckinId { get; set; }
 
@@ -474,7 +450,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Checkins
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -484,7 +459,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Pagination
 	{
-
 		[JsonProperty("next_url")]
 		public string NextUrl { get; set; }
 
@@ -497,7 +471,6 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed
 
 	public class Response
 	{
-
 		[JsonProperty("mg")]
 		public bool Mg { get; set; }
 

src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs

@@ -6,7 +6,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 {
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -16,7 +15,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -26,7 +24,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -39,7 +36,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -58,7 +54,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -68,7 +63,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Pagination
 	{
-
 		[JsonProperty("since_url")]
 		public string SinceUrl { get; set; }
 
@@ -81,14 +75,12 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Contact
 	{
-
 		[JsonProperty("facebook")]
 		public string Facebook { get; set; }
 	}
 
 	public class User
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -128,7 +120,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -156,7 +147,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Contact2
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -172,7 +162,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -188,7 +177,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -216,7 +204,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Item2
 	{
-
 		[JsonProperty("category_name")]
 		public string CategoryName { get; set; }
 
@@ -229,7 +216,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Categories
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -239,7 +225,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Location2
 	{
-
 		[JsonProperty("venue_address")]
 		public string VenueAddress { get; set; }
 
@@ -261,7 +246,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Contact3
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -271,7 +255,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Foursquare
 	{
-
 		[JsonProperty("foursquare_id")]
 		public string FoursquareId { get; set; }
 
@@ -281,7 +264,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class VenueIcon
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -294,7 +276,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Venue
 	{
-
 		[JsonProperty("venue_id")]
 		public int VenueId { get; set; }
 
@@ -328,7 +309,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Comments
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -341,7 +321,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Toasts
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -357,7 +336,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Photo
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -373,7 +351,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Item3
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -383,7 +360,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Media
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -393,7 +369,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Source
 	{
-
 		[JsonProperty("app_name")]
 		public string AppName { get; set; }
 
@@ -403,7 +378,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Badges
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -413,7 +387,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Item
 	{
-
 		[JsonProperty("checkin_id")]
 		public int CheckinId { get; set; }
 
@@ -457,7 +430,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Checkins
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -467,7 +439,6 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed
 
 	public class Response
 	{
-
 		[JsonProperty("pagination")]
 		public Pagination Pagination { get; set; }
 

src/Untappd.Net/Responses/UserBadges.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.UserBadges
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.UserBadges
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.UserBadges
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.UserBadges
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.UserBadges
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.UserBadges
 
 	public class Media
 	{
-
 		[JsonProperty("badge_image_sm")]
 		public string BadgeImageSm { get; set; }
 
@@ -82,7 +75,6 @@ namespace Untappd.Net.Responses.UserBadges
 
 	public class BadgePackProgress
 	{
-
 		[JsonProperty("completed")]
 		public int Completed { get; set; }
 
@@ -131,7 +123,6 @@ namespace Untappd.Net.Responses.UserBadges
 
 	public class Item
 	{
-
 		[JsonProperty("user_badge_id")]
 		public int UserBadgeId { get; set; }
 
@@ -192,7 +183,6 @@ namespace Untappd.Net.Responses.UserBadges
 
 	public class Response
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 

src/Untappd.Net/Responses/UserDistinctBeer.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.UserDistinctBeer
 {
-
 	public sealed class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -83,7 +78,6 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 
 	public class Contact
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -99,7 +93,6 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -115,7 +108,6 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -143,7 +135,6 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 
 	public class Item
 	{
-
 		[JsonProperty("first_checkin_id")]
 		public int FirstCheckinId { get; set; }
 
@@ -177,7 +168,6 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 
 	public class Beers
 	{
-
 		[JsonProperty("sort")]
 		public string Sort { get; set; }
 
@@ -195,12 +185,16 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 	{
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
+
 		[JsonProperty("toasts")]
 		public int Toasts { get; set; }
+
 		[JsonProperty("friends")]
 		public int Friends { get; set; }
+
 		[JsonProperty("messages")]
 		public int Messages { get; set; }
+
 		[JsonProperty("news")]
 		public int news { get; set; }
 	}
@@ -209,13 +203,13 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 	{
 		[JsonProperty("type")]
 		public string Type { get; set; }
+
 		[JsonProperty("unread_count")]
 		public UnreadCount UnreadCount { get; set; }
 	}
 
 	public class Response
 	{
-
 		[JsonProperty("is_search")]
 		public bool IsSearch { get; set; }
 
@@ -237,5 +231,4 @@ namespace Untappd.Net.Responses.UserDistinctBeer
 		[JsonProperty("response")]
 		public Response Response { get; set; }
 	}
-
 }

src/Untappd.Net/Responses/UserFriends.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.UserFriends
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.UserFriends
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.UserFriends
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.UserFriends
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.UserFriends
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.UserFriends
 
 	public class User
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -100,7 +93,6 @@ namespace Untappd.Net.Responses.UserFriends
 
 	public class MutualFriends
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -110,7 +102,6 @@ namespace Untappd.Net.Responses.UserFriends
 
 	public class Item
 	{
-
 		[JsonProperty("friendship_hash")]
 		public string FriendshipHash { get; set; }
 
@@ -126,7 +117,6 @@ namespace Untappd.Net.Responses.UserFriends
 
 	public class Response
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 

src/Untappd.Net/Responses/UserInfo.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.UserInfo
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Stats
 	{
-
 		[JsonProperty("total_badges")]
 		public int TotalBadges { get; set; }
 
@@ -94,7 +87,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -122,7 +114,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Contact
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -138,7 +129,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -154,7 +144,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -182,7 +171,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Item
 	{
-
 		[JsonProperty("beer")]
 		public Beer Beer { get; set; }
 
@@ -192,7 +180,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class RecentBrews
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -202,7 +189,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Contact2
 	{
-
 		[JsonProperty("facebook")]
 		public string Facebook { get; set; }
 
@@ -212,7 +198,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class User2
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -252,7 +237,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Beer2
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -280,7 +264,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Contact3
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -296,7 +279,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Location2
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -312,7 +294,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Brewery2
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -340,7 +321,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Item3
 	{
-
 		[JsonProperty("category_name")]
 		public string CategoryName { get; set; }
 
@@ -353,7 +333,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Categories
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -363,7 +342,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Location3
 	{
-
 		[JsonProperty("venue_address")]
 		public string VenueAddress { get; set; }
 
@@ -385,7 +363,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Contact4
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -395,7 +372,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Foursquare
 	{
-
 		[JsonProperty("foursquare_id")]
 		public string FoursquareId { get; set; }
 
@@ -405,7 +381,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class VenueIcon
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -418,7 +393,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Venue
 	{
-
 		[JsonProperty("venue_id")]
 		public int VenueId { get; set; }
 
@@ -452,7 +426,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Comments
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -465,7 +438,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class User3
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -499,7 +471,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Item4
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -518,7 +489,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Toasts
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -534,7 +504,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Photo
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -550,7 +519,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Item5
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -560,7 +528,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Media
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -570,7 +537,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Source
 	{
-
 		[JsonProperty("app_name")]
 		public string AppName { get; set; }
 
@@ -580,7 +546,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class BadgeImage
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -593,7 +558,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Item6
 	{
-
 		[JsonProperty("badge_id")]
 		public int BadgeId { get; set; }
 
@@ -615,7 +579,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Badges
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -625,7 +588,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Item2
 	{
-
 		[JsonProperty("checkin_id")]
 		public int CheckinId { get; set; }
 
@@ -669,7 +631,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Checkins
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -679,7 +640,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Photo2
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -695,7 +655,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class User4
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -726,7 +685,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Beer3
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -754,7 +712,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Contact5
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -770,7 +727,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Location4
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -786,7 +742,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Brewery3
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -814,7 +769,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Item8
 	{
-
 		[JsonProperty("category_name")]
 		public string CategoryName { get; set; }
 
@@ -827,7 +781,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Categories2
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -837,7 +790,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Location5
 	{
-
 		[JsonProperty("venue_address")]
 		public string VenueAddress { get; set; }
 
@@ -859,7 +811,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Contact6
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -869,7 +820,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Foursquare2
 	{
-
 		[JsonProperty("foursquare_id")]
 		public string FoursquareId { get; set; }
 
@@ -879,7 +829,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class VenueIcon2
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -892,7 +841,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Venue2
 	{
-
 		[JsonProperty("venue_id")]
 		public int VenueId { get; set; }
 
@@ -926,7 +874,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Item7
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -954,7 +901,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Media2
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -964,7 +910,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Contact7
 	{
-
 		[JsonProperty("facebook")]
 		public int Facebook { get; set; }
 
@@ -974,7 +919,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Badge
 	{
-
 		[JsonProperty("badges_to_facebook")]
 		public int BadgesToFacebook { get; set; }
 
@@ -984,7 +928,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Checkin
 	{
-
 		[JsonProperty("checkin_to_facebook")]
 		public int CheckinToFacebook { get; set; }
 
@@ -997,14 +940,12 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Navigation
 	{
-
 		[JsonProperty("default_to_checkin")]
 		public int DefaultToCheckin { get; set; }
 	}
 
 	public class Settings
 	{
-
 		[JsonProperty("badge")]
 		public Badge Badge { get; set; }
 
@@ -1021,7 +962,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class User
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -1098,7 +1038,6 @@ namespace Untappd.Net.Responses.UserInfo
 
 	public class Response
 	{
-
 		[JsonProperty("user")]
 		public User User { get; set; }
 	}

src/Untappd.Net/Responses/UserWishlist.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.UserWishlist
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -115,7 +108,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Contact
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -131,7 +123,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Location
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -147,7 +138,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -175,7 +165,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Item
 	{
-
 		[JsonProperty("created_at")]
 		public string CreatedAt { get; set; }
 
@@ -191,7 +180,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Beers
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -201,7 +189,6 @@ namespace Untappd.Net.Responses.UserWishlist
 
 	public class Response
 	{
-
 		[JsonProperty("sort")]
 		public string Sort { get; set; }
 

src/Untappd.Net/Responses/VenueInfo.cs

@@ -4,10 +4,8 @@ using Untappd.Net.Request;
 
 namespace Untappd.Net.Responses.VenueInfo
 {
-
 	public class ResponseTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -17,7 +15,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class InitTime
 	{
-
 		[JsonProperty("time")]
 		public double Time { get; set; }
 
@@ -27,7 +24,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Meta
 	{
-
 		[JsonProperty("code")]
 		public int Code { get; set; }
 
@@ -40,7 +36,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class UnreadCount
 	{
-
 		[JsonProperty("comments")]
 		public int Comments { get; set; }
 
@@ -59,7 +54,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Notifications
 	{
-
 		[JsonProperty("type")]
 		public string Type { get; set; }
 
@@ -69,7 +63,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item
 	{
-
 		[JsonProperty("category_name")]
 		public string CategoryName { get; set; }
 
@@ -82,7 +75,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Categories
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -92,7 +84,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Stats
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -111,7 +102,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class VenueIcon
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -124,7 +114,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Location
 	{
-
 		[JsonProperty("venue_address")]
 		public string VenueAddress { get; set; }
 
@@ -146,7 +135,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Contact
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -156,7 +144,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Foursquare
 	{
-
 		[JsonProperty("foursquare_id")]
 		public string FoursquareId { get; set; }
 
@@ -166,7 +153,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Photo
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -182,7 +168,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Beer
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -225,7 +210,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Contact2
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -238,7 +222,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Location2
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -254,7 +237,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Brewery
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -283,7 +265,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class User
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -308,7 +289,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item3
 	{
-
 		[JsonProperty("category_name")]
 		public string CategoryName { get; set; }
 
@@ -321,7 +301,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Categories2
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -331,7 +310,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Location3
 	{
-
 		[JsonProperty("venue_address")]
 		public string VenueAddress { get; set; }
 
@@ -353,7 +331,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Contact3
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -363,7 +340,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Foursquare2
 	{
-
 		[JsonProperty("foursquare_id")]
 		public string FoursquareId { get; set; }
 
@@ -373,7 +349,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class VenueIcon2
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -386,7 +361,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Venue2
 	{
-
 		[JsonProperty("venue_id")]
 		public int VenueId { get; set; }
 
@@ -421,7 +395,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item2
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -449,7 +422,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Media
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -459,7 +431,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class User2
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -487,7 +458,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Beer2
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -515,7 +485,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Contact4
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -531,7 +500,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Location4
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -547,7 +515,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Brewery2
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -576,7 +543,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item5
 	{
-
 		[JsonProperty("category_name")]
 		public string CategoryName { get; set; }
 
@@ -589,7 +555,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Categories3
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -599,7 +564,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Location5
 	{
-
 		[JsonProperty("venue_address")]
 		public string VenueAddress { get; set; }
 
@@ -621,7 +585,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Contact5
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -631,7 +594,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Foursquare3
 	{
-
 		[JsonProperty("foursquare_id")]
 		public string FoursquareId { get; set; }
 
@@ -641,7 +603,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class VenueIcon3
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -654,7 +615,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Venue3
 	{
-
 		[JsonProperty("venue_id")]
 		public int VenueId { get; set; }
 
@@ -689,7 +649,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class User3
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -729,7 +688,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item6
 	{
-
 		[JsonProperty("user")]
 		public User3 User { get; set; }
 
@@ -757,7 +715,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Comments
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -770,7 +727,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class User4
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -804,7 +760,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item7
 	{
-
 		[JsonProperty("uid")]
 		public int Uid { get; set; }
 
@@ -823,7 +778,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Toasts
 	{
-
 		[JsonProperty("total_count")]
 		public int TotalCount { get; set; }
 
@@ -839,7 +793,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Photo2
 	{
-
 		[JsonProperty("photo_img_sm")]
 		public string PhotoImgSm { get; set; }
 
@@ -855,7 +808,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item8
 	{
-
 		[JsonProperty("photo_id")]
 		public int PhotoId { get; set; }
 
@@ -865,7 +817,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Media2
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -875,7 +826,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Source
 	{
-
 		[JsonProperty("app_name")]
 		public string AppName { get; set; }
 
@@ -885,7 +835,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class BadgeImage
 	{
-
 		[JsonProperty("sm")]
 		public string Sm { get; set; }
 
@@ -898,7 +847,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item9
 	{
-
 		[JsonProperty("badge_id")]
 		public int BadgeId { get; set; }
 
@@ -920,7 +868,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Badges
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -930,7 +877,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item4
 	{
-
 		[JsonProperty("checkin_id")]
 		public int CheckinId { get; set; }
 
@@ -973,7 +919,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Checkins
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -983,7 +928,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Beer3
 	{
-
 		[JsonProperty("bid")]
 		public int Bid { get; set; }
 
@@ -1032,7 +976,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Contact6
 	{
-
 		[JsonProperty("twitter")]
 		public string Twitter { get; set; }
 
@@ -1045,7 +988,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Location6
 	{
-
 		[JsonProperty("brewery_city")]
 		public string BreweryCity { get; set; }
 
@@ -1061,7 +1003,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Brewery3
 	{
-
 		[JsonProperty("brewery_id")]
 		public int BreweryId { get; set; }
 
@@ -1090,7 +1031,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Friends
 	{
-
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
@@ -1100,7 +1040,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Item10
 	{
-
 		[JsonProperty("created_at")]
 		public string CreatedAt { get; set; }
 
@@ -1122,7 +1061,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class TopBeers
 	{
-
 		[JsonProperty("offset")]
 		public int Offset { get; set; }
 
@@ -1138,7 +1076,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Venue
 	{
-
 		[JsonProperty("venue_id")]
 		public int VenueId { get; set; }
 
@@ -1186,7 +1123,6 @@ namespace Untappd.Net.Responses.VenueInfo
 
 	public class Response
 	{
-
 		[JsonProperty("venue")]
 		public Venue Venue { get; set; }
 	}

src/Untappd.Net/SingleObjectArrayConverter.cs

@@ -16,7 +16,6 @@ namespace Untappd.Net
 		public override bool CanConvert(Type objectType)
 		{
 			return true;
-
 		}
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -29,6 +28,7 @@ namespace Untappd.Net
 					var instance = (T)serializer.Deserialize(reader, typeof(T));
 					retval = instance;
 					break;
+
 				case JsonToken.StartArray:
 					reader.Read();
 					retval = new T();