7 improve samples

Addresses issue #7 .