Merge pull request #22 from dongxuwang/master

Two polishes