More sample attribute improvements
Merge pull request #14 from meducation/improve_samples

More sample attribute improvements