Merge branch 'zz_local'

Add a singleton Demo