Merge branch 'master' into ob

Author: itsdeka

CHANGELOG

@@ -1,9 +1,10 @@
 1.2.1
 -) Added orderbook implementation example (ws)
 
-1.1.16
+1.2.0
 -) Implemented Margin Info (rest)
 -) Implemented claim position (rest)
+-) When max_retries == 0 continue forever to retry (websocket)
 
 1.1.15
 -) Added 'ids' parameter to get_order_history()

bfxapi/websockets/generic_websocket.py

@@ -128,7 +128,7 @@ async def _run_socket(self):
         s = Socket(sId)
         self.sockets[sId] = s
         loop = asyncio.get_event_loop()
-        while retries < self.max_retries and self.attempt_retry:
+        while self.max_retries == 0 or (retries < self.max_retries and self.attempt_retry):
             try:
                 async with websockets.connect(self.host) as websocket:
                     self.sockets[sId].set_websocket(websocket)