Adds count parameter to calls for getting list of merge fields.

Author: micheal-swiggs

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 group = "com.mailchimp"
-version = "0.4.0"
+version = "0.4.1"
 
 compileJava {
     sourceCompatibility = 1.8

src/main/java/com/mailchimp/MailChimpClient.java

@@ -18,7 +18,7 @@ public interface MailChimpClient {
     //public Object callList(@Param("list-id") String listId);
 
     @RequestLine("GET /3.0/lists/{list-id}/members/{user-id}")
-    public MemberDefault callMemberTyped(@Param("list-id") String listId, @Param("user-id") String userId);
+    public MemberDefault getListMember(@Param("list-id") String listId, @Param("user-id") String userId);
 
     @RequestLine("POST /3.0/lists/{list-id}/members")
     public MemberDefault createMember (@Param("list-id") String listId, MemberDefault memberDefault);
@@ -35,8 +35,8 @@ public interface MailChimpClient {
     @RequestLine("GET /3.0/lists/{list-id}/members?offset={offset}&count={count}")
     public MemberListDefault getPagedListMembers(@Param("list-id") String listId, @Param("offset") Integer offset, @Param("count") Integer count);
 
-    @RequestLine("GET /3.0/lists/{list-id}/merge-fields")
-    public MergeFieldsDefault getListMergeFields(@Param("list-id") String listId);
+    @RequestLine("GET /3.0/lists/{list-id}/merge-fields?count={count}")
+    public MergeFieldsDefault getListMergeFields(@Param("list-id") String listId, @Param("count") Integer count);
 
     @RequestLine("POST /3.0/lists/{list-id}/merge-fields")
     public MergeField createMergeField(@Param("list-id") String listId, MergeField mergeField);

src/main/java/com/mailchimp/domain/MemberDefault.java

@@ -52,8 +52,8 @@ public class MemberDefault
     @JsonSerialize(using = FlexDateSerializer.class)
     private Date lastChanged;
 
-	@JsonProperty(JsonConstants.MERGE_VARS)
-	private Map<String, String> mergeVars;
+    @JsonProperty(JsonConstants.MERGE_VARS)
+    private Map<String, String> mergeVars;
 
     public String getSubscriberHash()
     {