Frank's update

no add' desc
Merge pull request #2 from canaryvoice/master

Here are my changes