Merge branch 'Fixbug' into Develop

Conflicts:
main.cpp