Merge pull request #1 from danluu/master

Thanks Dan.