Tickets 62 and 64

https://github.com/easy-wi/developer/issues/62
https://github.com/easy-wi/developer/issues/64