Javadoc updates
Merge pull request #565 from bhariharan/unstable

Javadoc updates