Merge remote-tracking branch 'origin/setup' to inlcude the sample snipplet