Merge branch 'master' into devel
Demo address updated
Merge branch 'devel'