diff --git a/src/ofxOpenNI.cpp b/src/ofxOpenNI.cpp
index 994b5ea..8050151 100644
--- a/src/ofxOpenNI.cpp
+++ b/src/ofxOpenNI.cpp
@@ -37,8 +37,12 @@
 //--------------------------------------------------------------
 ofxOpenNI::ofxOpenNI(){
 	instanceCount++;
-	instanceID = instanceCount; // TODO: this should be replaced/combined with a listDevices and setDeviceID methods
-
+	// by default we use multiple kinects in the order they're available
+	// but you can also use setDeviceID to manually pick the deviceID
+	// if you try to run user generators with more than one device in the same
+	// process you'll be warned.
+	instanceID = instanceCount;
+	
     LOG_NAME = "ofxOpenNIDevice[" + ofToString(instanceID) + "]";
     //cout << LOG_NAME << ": constructor called" << endl;
 
@@ -753,7 +757,7 @@ bool ofxOpenNI::addInfraGenerator(){
 //--------------------------------------------------------------
 bool ofxOpenNI::addUserGenerator(){
     ofxOpenNIScopedLock scopedLock(bIsThreaded, mutex);
-    if(instanceID > 0) {
+    if(instanceCount > 0) {
         // see: http://groups.google.com/group/openni-dev/browse_thread/thread/188a2ac823584117
         ofLogWarning(LOG_NAME) << "Currently it is only possible to have a user generator on one device in a single process!!";
         g_bIsUserOn = false;
@@ -2768,6 +2772,11 @@ int ofxOpenNI::getNumDevices(){
 	return numDevices;
 }
 
+//--------------------------------------------------------------
+void ofxOpenNI::setDeviceID(int deviceID){
+	instanceID = deviceID;
+}
+
 //--------------------------------------------------------------
 int ofxOpenNI::getDeviceID(){
 	return instanceID;
diff --git a/src/ofxOpenNI.h b/src/ofxOpenNI.h
index 371ac49..7d13352 100644
--- a/src/ofxOpenNI.h
+++ b/src/ofxOpenNI.h
@@ -286,6 +286,8 @@ class ofxOpenNI : public ofThread {
 	ofPoint cameraToWorld(const ofVec2f& c);
 	void cameraToWorld(const vector<ofVec2f>& c, vector<ofVec3f>& w);
 
+	
+	void setDeviceID(int deviceID);
     int getDeviceID();
 
     xn::Context& getContext();