Partial 3 for ticket 17

Partial 3 for https://github.com/easy-wi/developer/issues/17