This needs to be done
Merge pull request #1 from gchaix/master

This needs to be done