issues/26 issues/11

https://github.com/easy-wi/developer/issues/11
https://github.com/easy-wi/developer/issues/26