Merge pull request #1 from benkhleung/testBranch

Update test.java
Merge pull request #2 from benkhleung/master

Merge pull request #1 from benkhleung/testBranch