diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index ccbccc3..0000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-2.2.0
diff --git a/lib/cap-ec2/ec2-handler.rb b/lib/cap-ec2/ec2-handler.rb
index 2d54887..fd4078e 100644
--- a/lib/cap-ec2/ec2-handler.rb
+++ b/lib/cap-ec2/ec2-handler.rb
@@ -71,7 +71,10 @@ def get_servers_for_role(role)
             (fetch(:ec2_filter_by_status_ok?) ? instance_status_ok?(i) : true)
         end
       end
-      servers.flatten.sort_by {|s| s.tags["Name"] || ''}
+      servers.flatten.sort_by {|s| s.tags["Name"] || ''}.
+        select{|i| !ENV['instance_ip'] || (ENV['instance_ip'] == i.private_ip_address)}.
+        select{|i| !ENV['instance_name'] || (ENV['instance_name'] == i.tags['Name'])}.
+        select{|i| !ENV['role_name'] || i.tags['Roles'].split(/ *, */).include?(ENV['role_name'])}
     end
 
     def get_server(instance_id)
diff --git a/lib/cap-ec2/version.rb b/lib/cap-ec2/version.rb
index f09ea84..4271969 100644
--- a/lib/cap-ec2/version.rb
+++ b/lib/cap-ec2/version.rb
@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end