Fighting cors.
Merge branch 'master' of https://github.com/IvayloGeorgiev/TA-Kiwi.git