Ticket 42

https://github.com/easy-wi/developer/issues/42