Tickets 31 and 32

https://github.com/easy-wi/developer/issues/31
https://github.com/easy-wi/developer/issues/32