diff --git a/.gitignore b/.gitignore
index 73aec89..c73fbff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ dist/test
 TODO.txt
 node_modules
 doc/public
+.idea
diff --git a/Cakefile b/Cakefile
index e74b799..a682992 100644
--- a/Cakefile
+++ b/Cakefile
@@ -1,8 +1,17 @@
 fs     = require 'fs'
 {exec} = require 'child_process'
 util   = require 'util'
+path   = require 'path'
 
-binDir = "./node_modules/.bin/"
+cakefileDirectory = (dir) ->
+  return dir if fs.existsSync path.join dir, 'Cakefile'
+  parent = path.normalize path.join dir, '..'
+  return cakefileDirectory parent unless parent is dir
+  throw new Error "Cakefile not found in #{process.cwd()}"
+
+cakeDir = cakefileDirectory global.__originalDirname
+
+binDir = cakeDir + "/node_modules/.bin/"
 
 task 'watch', 'Watch for changes in coffee files to build and test', ->
     util.log "Watching for changes in src and test"
@@ -53,7 +62,7 @@ task 'build:doc', 'Build docco documentation', ->
 
 task 'build:test', 'Build the test files into lib/test', ->
   util.log "Compiling test..."
-  exec binDir + "coffee -o dist/test/ -c test/", (err, stdout, stderr) -> 
+  exec binDir + "coffee -o dist/test/ -c test/", (err, stdout, stderr) ->
     handleError(err) if err
 
 watchDir = (dir, callback) ->
diff --git a/lib/stomp-node.js b/lib/stomp-node.js
index 68660ee..a268274 100644
--- a/lib/stomp-node.js
+++ b/lib/stomp-node.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 
 /*
    Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache License V2.0
diff --git a/lib/stomp.js b/lib/stomp.js
index 9c30356..9a552a3 100644
--- a/lib/stomp.js
+++ b/lib/stomp.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 
 /*
    Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache License V2.0
diff --git a/lib/stomp.min.js b/lib/stomp.min.js
index dd0b1fa..8e43654 100644
--- a/lib/stomp.min.js
+++ b/lib/stomp.min.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 /*
    Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache License V2.0