composite tests
Merge remote-tracking branch 'upstream/master'
fix demo
Merge pull request #191 from patriot1burke/master

composite tests and fix distro