Merge pull request #559 from bhariharan/unstable

Latest samples
Miscellaneous bug fixes