More expressive version; header only; sample and README both updated