Tickets 19 and 21

https://github.com/easy-wi/developer/issues/19
https://github.com/easy-wi/developer/issues/21