Partial for ticket 17

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