Merge pull request

All the three tests are successful now...