Merge pull request #410 from bhariharan/unstable

Latest shared commit
Latest shared