added sample, fixed links
conflicts fixed
committing to pull