Merge pull request #40 from chenkie/master Update sample for use with beta 0