In the future, you should really rebase your branch before submitting a pull request. If you look at your pull request, you'll see what I mean. Its very difficult to tell what actual changes are needed here.