diff --git a/Gemfile b/Gemfile
index 83c0c4a66..682b2ce94 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,13 +2,10 @@ source 'https://rubygems.org'
 
 # Look for $WORKSPACE, otherwise use "workspace" as dev path.
 workspace = ENV["WORKSPACE"] || "~/workspace"
-
 gem 'uuidtools', '2.1.2'
 gem 'bcrypt-ruby', '3.0.1'
 gem 'jruby-openssl'
 gem 'ruby-protocol-buffers', '1.2.2'
-gem 'pg_migrate','0.1.5' #:path => "#{workspace}/pg_migrate_ruby"
-gem 'jam_db', :path => "#{workspace}/jam-db/target/ruby_package"
 gem 'jam_ruby', :path => "#{workspace}/jam-ruby"
 gem 'jampb', :path => "#{workspace}/jam-pb/target/ruby/jampb"
 gem 'em-websocket'#, :path=> "#{workspace}/em-websocket-jam"
@@ -24,6 +21,7 @@ group :development do
 end
 
 group :test do
+    gem 'jam_db', :path => "#{workspace}/jam-db/target/ruby_package"
     gem 'cucumber'
     gem 'rspec'
     gem 'factory_girl'
@@ -31,5 +29,6 @@ group :test do
     gem 'database_cleaner', '0.7.0'
     gem 'guard', '>= 0.10.0'
     gem 'guard-rspec', '>= 0.7.3'
-gem 'guard-jruby-rspec'
+    gem 'pg_migrate','0.1.5' #:path => "#{workspace}/pg_migrate_ruby"
+    gem 'guard-jruby-rspec'
 end
diff --git a/bin/websocket_gateway b/bin/websocket_gateway
index 480ca4f1a..b82d6e035 100755
--- a/bin/websocket_gateway
+++ b/bin/websocket_gateway
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 require 'jam_websockets'
 
diff --git a/bin/websocket_gateway_win.sh b/bin/websocket_gateway_win.sh
new file mode 100644
index 000000000..b6c741b4e
--- /dev/null
+++ b/bin/websocket_gateway_win.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# this script is used only in development
+
+# Look for $WORKSPACE, otherwise use "workspace" as dev path.
+if [ -z "$WORKSPACE" ]; then
+	WORKSPACE="~/workspace"	
+fi
+
+
+jruby -I"$WORKSPACE/jam-ruby/lib" -I"$WORKSPACE/jam-pb/target/ruby/jampb/lib" -I"$WORKSPACE/jam-db/target/ruby_package/lib" -Ilib bin/websocket_gateway $*