fix error - #330
fix error - #330
Merge branch 'frontend_integration' of https://github.com/ndomar/megasoft-14 into frontend_integration