Merge pull request #35 from bhariharan/unstable

Bringing in the latest source code
Latest source code