My Changes

Using this pull request for my Google Summer Of Code Project