Latest from unstable
Merge pull request #27 from bhariharan/unstable

Grabbing the latest from unstable