Merge pull request #148 from bhariharan/unstable

Merge branch 'master' into unstable
Replacing PDF with errors
Merge branch 'master' into unstable