fixfixfix
Merge pull request #236 from Verkalets/fix_other_frontend

fixfixfix
fixfixfix
Merge pull request #237 from Verkalets/fix_all_issue

fixfixfix
kaminary