Merge pull request #32 from bhariharan/unstable

Merge branch 'unstable23' into unstable