Updating stuff

I think I made it right now.
Merge pull request #722 from raymondtfr/new

Updating stuff