fix #175
Merge branch 'issue_175' of github.com:MaksJS/frontend into MaksJS-issue_175