working version
Merge pull request #17 from thebrianzeng/master

working version