diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..df9beba
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,3 @@
+
+test:
+	@mocha -R spec tests/test.js
diff --git a/README.md b/README.md
index 296bb24..99f4323 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,35 @@
 
 # JavaScript 拼音
 
-用 Javascript 将汉字转为拼音，方便汉字注音、排序。
+将汉语转为拼音。可以用于汉字注音、排序、检索。
 
-支持将汉字转换为多种不同风格的拼音。
+## 特性
 
-## 安装
+* 根据词组智能匹配最正确的拼音。
+* 支持多音字。
+* 简单的繁体支持。
+* 支持多种不同拼音风格。
 
-暂时未托管到 npmjs.org
+## 安装
 
-    git clone git://github.com/hotoo/node-pinyin.git
-    npm install ./node-pinyin
+```
+npm install pinyinjs
+```
 
 ## 用法
 
-    var pinyin = require("pinyin");
-
-    console.log(pinyin("中心"));    // [ [ 'zhōng' ], [ 'xīn' ] ]
-    console.log(pinyin("中心", {
-      heteronym: true               // 启用多音字模式
-    }));                            // [ [ 'zhōng', 'zhòng' ], [ 'xīn' ] ]
-    console.log(pinyin("中心", {
-      style: pinyin.STYLE_INITIALS, // 设置拼音风格
-      heteronym: true
-    }));                            // [ [ 'zh' ], [ 'x' ] ]
-
+```js
+var pinyin = require("pinyin");
+
+console.log(pinyin("中心"));    // [ [ 'zhōng' ], [ 'xīn' ] ]
+console.log(pinyin("中心", {
+  heteronym: true               // 启用多音字模式
+}));                            // [ [ 'zhōng', 'zhòng' ], [ 'xīn' ] ]
+console.log(pinyin("中心", {
+  style: pinyin.STYLE_INITIALS, // 设置拼音风格
+  heteronym: true
+}));                            // [ [ 'zh' ], [ 'x' ] ]
+```
 
 ## API
 
diff --git a/bin/cli.js b/bin/cli.js
deleted file mode 100644
index 908ba84..0000000
--- a/bin/cli.js
+++ /dev/null
@@ -1 +0,0 @@
-#!/usr/bin/env node
diff --git a/bin/pinyin b/bin/pinyin
new file mode 100755
index 0000000..7938db9
--- /dev/null
+++ b/bin/pinyin
@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+var commander = require('commander');
+//require('colors');
+var pinyin = require("../src/pinyin");
+
+commander.
+  version(require('../package').version).
+  usage('[options] 汉字').
+  option('-v, --version', 'output the version number').
+  option('-s, --style <style>', 'pinyin styles').
+  //option('-h, --heteronym', 'output heteronym pinyins').
+  parse(process.argv);
+
+if (commander.list) {
+  process.exit()
+}
+
+// output help and exit if no args found
+if (commander.args.length === 0) {
+  commander.help();
+}
+
+console.log(pinyin(commander.args.join(" "), {
+  style: pinyin["STYLE_" + (commander.style || "TONE").toUpperCase()],
+  heteronym: commander.heteronym || false
+}).join(" "));
+
+ /*
+ vim:ft=javascript
+ */
diff --git a/package.json b/package.json
index 7e75228..b9e728a 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,17 @@
 {
-  "name": "pinyin2",
-  "version": "0.1.0",
-  "description": "Chinese Pinyin converter.",
+  "name": "pinyinjs",
+  "version": "2.0.1",
+  "description": "汉语拼音转换工具。",
   "main": "src/pinyin.js",
+  "bin": {
+    "pinyin": "./bin/pinyin"
+  },
   "directories": {
     "example": "examples",
     "test": "tests"
   },
   "scripts": {
-    "test": "tests/pinyin.js"
+    "test": "mocha -R spec tests/test.js"
   },
   "repository": {
     "type": "git",
@@ -16,7 +19,8 @@
   },
   "dependencies": {
     "segment": "0.0.2",
-    "simplebig": "0.0.3"
+    "simplebig": "0.0.3",
+    "commander": "~1.1.1"
   },
   "keywords": ["拼音", "Pinyin"],
   "author": "闲耘 <hotoo.cn@gmail.com>",
diff --git a/tests/test.js b/tests/test.js
index 717d405..3a3e77a 100644
--- a/tests/test.js
+++ b/tests/test.js
@@ -6,24 +6,22 @@
  */
 
 var assert = require("assert");
+var should = require("should");
 var pinyin = require("../src/pinyin");
 
-/*
- * 笛卡尔乘积，返回两个数组的所有可能的组合。
- * @param {Array}
- * @param {Array}
- * @return {Array}
- */
-function product(a,b){
-  var r=[];
-  for (var i=0,l=a.length; i<l; i++){
-    for (var j=0,m=b.length; j<m; j++){
-      r[r.length] = (a[i] instanceof Array) ? a[i].concat(b[j]) : [].concat(a[i],b[j]);
-    }
-  }
-  return r;
-}
+describe("单个汉字", function(){
+  it("单", function(){
+    var py = pinyin("单");
+    pinyin("单").should.eql([["dān"]]);
+  });
+});
+
+console.log(pinyin('本票通【航旅专业版】',{
+        style: pinyin.STYLE_NORMAL,
+        heteronym: false
+    }));
 
+return;
 var hans1 = "天将将大任于斯人也";
 var hans2 = "在地球重力的影响下，重心不稳。";