Add some changes
Merge pull request #1 from miramax/testBranch

Add some changes