JavaDoc added and fixed
Indentation & format fixes
Javadoc - indentation & format fixes
Merge pull request #464

- JavaDoc added and fixed.
- Indentation & format fixes.