diff --git a/examples/gun.js b/examples/gun.js
index 4bfdb140b8..6cdf634239 100644
--- a/examples/gun.js
+++ b/examples/gun.js
@@ -39,6 +39,8 @@ var impactSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-pub
 var targetHitSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/hit.raw");
 var targetLaunchSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/shoot.raw");
 
+var gunModel = "http://highfidelity-public.s3-us-west-1.amazonaws.com/models/attachments/Raygun2.fst";
+
 var audioOptions = new AudioInjectionOptions();
 audioOptions.volume = 0.9;
 
@@ -190,6 +192,8 @@ function keyPressEvent(event) {
     }
 }
 
+MyAvatar.attach(gunModel, "RightHand", {x: -0.10, y: 0.0, z: 0.0}, Quat.fromPitchYawRollDegrees(-90, 180, 0), 0.14);
+
 function update(deltaTime) {
     //  Check for mouseLook movement, update rotation 
        // rotate body yaw for yaw received from mouse
@@ -303,7 +307,8 @@ function mouseMoveEvent(event) {
 
 function scriptEnding() {
     Overlays.deleteOverlay(reticle); 
-    Overlays.deleteOverlay(text); 
+    Overlays.deleteOverlay(text);
+    MyAvatar.detachOne(gunModel);
 }
 
 Particles.particleCollisionWithVoxel.connect(particleCollisionWithVoxel);
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index bc2bbb6712..bac339813f 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -709,7 +709,9 @@ void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
 
 void Avatar::setAttachmentData(const QVector<AttachmentData>& attachmentData) {
     AvatarData::setAttachmentData(attachmentData);
-    
+    if (QThread::currentThread() != thread()) {    
+        return;
+    }
     // make sure we have as many models as attachments
     while (_attachmentModels.size() < attachmentData.size()) {
         Model* model = new Model(this);
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index b226da8b5c..26613e51d0 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -685,9 +685,22 @@ void AvatarData::setAttachmentData(const QVector<AttachmentData>& attachmentData
     _attachmentData = attachmentData;
 }
 
-void AvatarData::attach(const QString& modelURL, const QString& jointName,
-        const glm::vec3& translation, const glm::quat& rotation, float scale) {
+void AvatarData::attach(const QString& modelURL, const QString& jointName, const glm::vec3& translation,
+        const glm::quat& rotation, float scale, bool allowDuplicates) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "attach", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName),
+            Q_ARG(const glm::vec3&, translation), Q_ARG(const glm::quat&, rotation),
+            Q_ARG(float, scale), Q_ARG(bool, allowDuplicates));
+        return;
+    }
     QVector<AttachmentData> attachmentData = getAttachmentData();
+    if (!allowDuplicates) {
+        foreach (const AttachmentData& data, attachmentData) {
+            if (data.modelURL == modelURL && (jointName.isEmpty() || data.jointName == jointName)) {
+                return;
+            }
+        }
+    }
     AttachmentData data;
     data.modelURL = modelURL;
     data.jointName = jointName;
@@ -699,17 +712,25 @@ void AvatarData::attach(const QString& modelURL, const QString& jointName,
 }
 
 void AvatarData::detachOne(const QString& modelURL, const QString& jointName) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "detachOne", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName));
+        return;
+    }
     QVector<AttachmentData> attachmentData = getAttachmentData();
     for (QVector<AttachmentData>::iterator it = attachmentData.begin(); it != attachmentData.end(); it++) {
         if (it->modelURL == modelURL && (jointName.isEmpty() || it->jointName == jointName)) {
             attachmentData.erase(it);
+            setAttachmentData(attachmentData);
             return;
         }
     }
-    setAttachmentData(attachmentData);
 }
 
 void AvatarData::detachAll(const QString& modelURL, const QString& jointName) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "detachAll", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName));
+        return;
+    }
     QVector<AttachmentData> attachmentData = getAttachmentData();
     for (QVector<AttachmentData>::iterator it = attachmentData.begin(); it != attachmentData.end(); ) {
         if (it->modelURL == modelURL && (jointName.isEmpty() || it->jointName == jointName)) {
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 1fd8f6c425..cc5ab16e35 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -241,7 +241,8 @@ public:
     Q_INVOKABLE virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData);
     
     Q_INVOKABLE virtual void attach(const QString& modelURL, const QString& jointName = QString(),
-        const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(), float scale = 1.0f);
+        const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(), float scale = 1.0f,
+        bool allowDuplicates = false);
     
     Q_INVOKABLE void detachOne(const QString& modelURL, const QString& jointName = QString());
     Q_INVOKABLE void detachAll(const QString& modelURL, const QString& jointName = QString());