Merge pull request #2 from davidyuan1989/david_b

David b