#248 Remove optional features from samples. Add an optional package to demo which shows their use.