Implements changes in #9

The detailed log is in #9 

I haven't added basic authentication as seen in the daily meeting, I'll wait this goes to production and that Lucas and Nicolas come back.