Ticket 72 and partial for ticket 17

https://github.com/easy-wi/developer/issues/72
https://github.com/easy-wi/developer/issues/17