merge pull request #51

Since can't automatically merge the request, I changed the files one by
one