Merge issue 71 (play sample on demand)