Ticket 43

https://github.com/easy-wi/developer/issues/43
Merge branch 'master' of https://github.com/easy-wi/developer