https://github.com/yoni-mor/Web-App/issues/6