Ticket 36

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