sanitize data
Merge branch 'master' of https://github.com/aiisahik/frontend-test