Fix - Issue #1 "Same code in 3 version of Demo project"
Merge remote-tracking branch 'upstream/master'