fixes
Merge pull request #1 from davidyang/master

fixes