Changed. Will compile all my changes and submit another pull request.