diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 081ebd7..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: node_js
-node_js:
-  - "node"
-  - "8"
-
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq tor
-
-install:
-  - npm install
-
-script: 
-  - TOR_PATH=/usr/bin/tor npm test
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dca4f42..f7522e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,8 +22,27 @@
 ### Added
 - Bundles the Tor executable with the application. Tor will be downloaded during "npm install"
 - Signals and Configuration changes can be sent to live Tor instances via the Tor Control Protocol
-- Adds TorProcess.new_identity
 
 ### Changed
 - By default Tor Router will use the Tor executable bundled with the application, to override use the "TOR_PATH" environment variable
-- Deprecates the TorPool.new_ips and TorProcess.new_ip functions use TorPool.new_identites and TorProcess.new_identity function respectively.
\ No newline at end of file
+- Deprecates the TorPool.new_ips and TorProcess.new_ip functions use TorPool.new_identites and TorProcess.new_identity function respectively.
+
+## [3.3.0] - 2018-05-10
+
+### Added
+- Adds documentation on all RPC Methods available
+- Allows different load-balance methods to be defined, and changed at runtime and via RPC
+- Each instance can have started with a specific configuration (torrc) by setting the "Config" property in the definition
+
+### Changed
+- If the "Name" property in the definition was not set the data directory will be deleted when the Tor Process exits
+- Switches from "commander" to "nconf"/"yargs" for command line processing, switches however will remain the same
+
+## [3.2.2] - 2018-05-08
+
+### Added
+- Fixes
+
+### Changed
+- Tor Router and child Tor processes are run as an unprivilieged user in the Docker container
+- Fixes [Issue #4](https://github.com/znetstar/tor-router/issues/4)
\ No newline at end of file
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
new file mode 100644
index 0000000..ea55bd6
--- /dev/null
+++ b/bitbucket-pipelines.yml
@@ -0,0 +1,9 @@
+image: znetstar/tor-router:3.4.1
+  
+pipelines:
+  default:
+    - step:
+        name: Build and test
+        script:
+          - npm install
+          - npm test
\ No newline at end of file
diff --git a/package.json b/package.json
index 015f042..0c13bf1 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   },
   "scripts": {
     "start": "bin/tor-router -s -d -j 1",
-    "test": "mocha test/test.js",
+    "test": "mocha --exit test/test.js",
     "debug": "node --inspect-brk bin/tor-router"
   },
   "devDependencies": {