Bug fix
Merge branch 'master' of https://github.com/4x7y/Demo1