Merge pull request #10 from xiaoqin2012/master

release 0.6
Merge pull request #30 from piaw/master

Merge pull request #10 from xiaoqin2012/master