Test merge
Merge pull request #2 from adrianliaw/master

Test merge