Fixes javadoc warnings
Fixes deprecation and unchecked warnings
Fixes javadoc warnings
Fixes deprecation and unchecked warnings
Merge conflicts
Merge pull request #50 from vsalaman/jdfix

Fixes javadoc, deprecation and unchecked warnings