working version for demo
Merge pull request #5 from nancywong/nancy

working version for demo