Fixing demo source reference
Merging master