Bug fix
Merge branch 'master' of https://github.com/Plankton555/SOCS_project