diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index a8b554359..aaa23ad5b 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -55,6 +55,10 @@ public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
 
 	public CreateContainerCmd withMemorySwap(long memorySwap);
 
+	public int getCpuShares();
+
+	public CreateContainerCmd withCpuShares(int cpuShares);
+
 	public boolean isAttachStdin();
 
 	public CreateContainerCmd withAttachStdin(boolean attachStdin);
@@ -96,10 +100,11 @@ public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
 	 * @throws NotFoundException No such container
 	 * @throws ConflictException Named container already exists
 	 */
+        @Override
 	public CreateContainerResponse exec() throws NotFoundException,
 			ConflictException;
 	
 	public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 4d3ab26e0..b3f020f94 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -29,6 +29,7 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("User")         private String    user = "";
     @JsonProperty("Memory")       private long      memoryLimit = 0;
     @JsonProperty("MemorySwap")   private long      memorySwap = 0;
+    @JsonProperty("CpuShares")    private int       cpuShares = 0;
     @JsonProperty("AttachStdin")  private boolean   attachStdin = false;
     @JsonProperty("AttachStdout") private boolean   attachStdout = false;
     @JsonProperty("AttachStderr") private boolean   attachStderr = false;
@@ -188,6 +189,16 @@ public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
         return this;
     }
 
+    @Override
+	public int getCpuShares() {
+        return cpuShares;
+    }
+
+    @Override
+	public CreateContainerCmdImpl withCpuShares(int cpuShares) {
+        this.cpuShares = cpuShares;
+        return this;
+    }
 
     @Override
 	public boolean isAttachStdin() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index 6c659d0f3..2b469da92 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -25,12 +25,12 @@ public AttachContainerCmdExec(WebTarget baseResource) {
 	@Override
 	public InputStream exec(AttachContainerCmd command) {
 		WebTarget webResource = getBaseResource().path("/containers/{id}/attach")
-                .resolveTemplate("{id}", command.getContainerId())
+                .resolveTemplate("id", command.getContainerId())
                 .queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
-                .queryParam("timestamps",command.hasTimestampsEnabled() ? "1" : "0")
+             // .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
                 .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
                 .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
-                .queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0");
+                .queryParam("stream", command.hasFollowStreamEnabled() ? "1" : "0");
 
 		LOGGER.trace("POST: {}", webResource);