Merge branches 'develop' and 'develop' of https://github.com/Mu5tank05/Walter into develop