Merge pull request #10 from xiaoqin2012/master

release 0.6