Merge branch 'master' into addEventSubscriptions

# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
#	src/types.ts
#	test/exchange_wrapper_test.ts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/0x.js.ts b/src/0x.js.ts
index 0cda7732d..850827fee 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -135,7 +135,7 @@ export class ZeroEx {
         return senderAccountIfExists;
     }
     /**
-     * Computes the orderHash given the order parameters and returns it as a hex encoded string.
+     * Computes the orderHash for a given order and returns it as a hex encoded string.
      */
     public async getOrderHashHexAsync(order: Order|SignedOrder): Promise<string> {
         const exchangeContractAddr = await this.getExchangeAddressAsync();