Merge pull request #407 from bhariharan/unstable

Bug fixes
Latest shared commit