Merge pull request #1 from devanlai/master