Merge pull request #370 from KurtStam/master

fix for https://bugzilla.redhat.com/show_bug.cgi?id=1041334
Place demo assembly into its own module; SRAMP-261
Merge pull request #371 from knrc/master

Place demo assembly into its own module; SRAMP-261