bug
Merge pull request #1 from aarongao/master

?