Update samples to clarify specs. Related to issue #42, #45, #46, #47.