Fix
Merge https://github.com/IvayloGeorgiev/JokeBook