Merge pull request #1 from labriola/develop

Evolving HMSS demo
Evolving the HMSS demo to include some mapping support