diff --git a/.gitignore b/.gitignore
index 32d2311..7a1caed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 config.json
 node_modules
 npm-debug.log
+.idea
diff --git a/package.json b/package.json
index 216f06f..162dfae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,5 @@
 {
     "dependencies": {
-        "aws-sdk": ">= 2.0.9",
-        "node-uuid": ">= 1.4.1"
+        "aws-sdk": ">= 2.0.9"
     }
-}
+}
\ No newline at end of file
diff --git a/sample.js b/sample.js
index 5d947ff..9fac158 100644
--- a/sample.js
+++ b/sample.js
@@ -12,25 +12,36 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
-**/
+ **/
 
-// Load the SDK and UUID
+// Load the SDK
 var AWS = require('aws-sdk');
-var uuid = require('node-uuid');
 
 // Create an S3 client
 var s3 = new AWS.S3();
 
-// Create a bucket and upload something into it
-var bucketName = 'node-sdk-sample-' + uuid.v4();
+var bucketName = 'node.sdk.sample.bucket';
 var keyName = 'hello_world.txt';
+var lastModified = new Date().toString();
 
-s3.createBucket({Bucket: bucketName}, function() {
-  var params = {Bucket: bucketName, Key: keyName, Body: 'Hello World!'};
-  s3.putObject(params, function(err, data) {
+// Check if bucket exists or create a new one
+s3.headBucket({ Bucket: bucketName }, function(errResponse, requestResponse) {
+    var params = { Bucket: bucketName, Key: keyName, Body: 'Hello World! ' + lastModified };
+    if (errResponse) {
+        console.log("Create new bucket before upload");
+        s3.createBucket({ Bucket: bucketName }, function() {
+            s3.putObject(params, uploadFileCallback);
+        });
+    } else {
+        console.log("Bucket already exists, continue with upload");
+        s3.putObject(params, uploadFileCallback);
+    }
+});
+
+// Response handler
+function uploadFileCallback(err, data) {
     if (err)
-      console.log(err)
+        console.log(err)
     else
-      console.log("Successfully uploaded data to " + bucketName + "/" + keyName);
-  });
-});
+        console.log("Successfully uploaded data to " + bucketName + "/" + keyName);
+}
\ No newline at end of file