Improve sample attributes
Merge pull request #13 from meducation/improve_samples

Improve sample attributes