examples/sample_app/script/merb_stop in merb-0.0.6 vs examples/sample_app/script/merb_stop in merb-0.0.7

@@ -1,9 +1,13 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-pids = IO.readlines(File.dirname(__FILE__)+"/../log/merb.pid").map{|p| p.to_i}
 
-pids.each do |pid|
+pids=[]
+
+port_or_star = ARGV[0] || '*'
+
+Dir[File.dirname(__FILE__)+"/../log/merb.#{port_or_star}.pid"].each do |f|
+  pid = IO.read(f).chomp.to_i
   puts "killing PID: #{pid}"
   Process.kill(9, pid)
+  FileUtils.rm f
 end
-FileUtils.rm File.dirname(__FILE__)+"/../log/merb.pid"
\ No newline at end of file