Merge branch 'release/3.1.2-2'

README.md

@@ -12,23 +12,40 @@ Requirements:
 npm install crypto-js
 ```
 
-### USE
+### Usage
 
+Modular include:
 ```javascript
 var AES = require("crypto-js/aes");
 var SHA256 = require("crypto-js/sha256");
+...
+console.log(SHA256("Message"));
+```
+
+Including all libraries, for access to extra methods:
+```javascript
+var CryptoJS = require("crypto-js");
+console.log(CryptoJS.HmacSHA1("Message", "Key"));
 ```
 
 ## Client (browser)
 
-### USE
+### Usage
 
+Modular include:
 ```javascript
 require(["crypto-js/aes", "crypto-js/sha256"], function (AES, SHA256) {
+    console.log(SHA256("Message"));
+});
+```
 
+Including all libraries, for access to extra methods:
+```javascript
+require("crypto-js", function (CryptoJS) {
+    console.log(CryptoJS.HmacSHA1("Message", "Key"));
 });
 ```
 
 ## API
 
-See: https://code.google.com/p/crypto-js
+See: https://code.google.com/p/crypto-js

package.json

@@ -2,7 +2,7 @@
 	"name": "crypto-js",
 	"title": "crypto-js",
 	"description": "Modularized port of googlecode project crypto-js.",
-	"version": "3.1.2-1",
+	"version": "3.1.2-2",
 	"homepage": "http://github.com/evanvosberg/crypto-js",
 	"author": {
 		"name": "Evan Vosberg",