fix
Merge pull request #60 from huangnoah/fix-20130403

fix