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