Merge pull request #1 from emc2cube/master

Fade demo + factory minor changes
Merge remote-tracking branch 'upstream/master'