Merge pull request #136 from bhariharan/unstable

Merge 'master' to unstable
Tiny bug fix