Merge pull request #167 from mpeuster/master

Fix: Enabled SAP and learning switch to test demo. Also clearified so…