From 9f91bbfbc949c565576d853b45d779cc63fc3011 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Fri, 20 Mar 2015 15:19:25 -0300
Subject: [PATCH] merge with master fixes

---
 config/default.yml    | 2 +-
 lib/networkmonitor.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/default.yml b/config/default.yml
index dac9711e..9b5e636c 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -6,7 +6,7 @@ BitcoreNode:
 Reporter: none # none, simple, matrix
 LevelUp: ./db
 RPC:
-  user: username
+  user: user
   pass: password
   protocol: http
   host: 127.0.0.1
diff --git a/lib/networkmonitor.js b/lib/networkmonitor.js
index ccbf1956..97dad3d7 100644
--- a/lib/networkmonitor.js
+++ b/lib/networkmonitor.js
@@ -66,6 +66,7 @@ NetworkMonitor.prototype.start = function() {
   this.peer.connect();
 };
 NetworkMonitor.prototype.stop = function(reason) {
+  console.trace();
   this.peer.disconnect();
   if (reason) {
     throw reason;