Merge pull request #233 from mpeuster/demo-mano-integration