Javadoc updates
Merge #3

Thanks @gmcferrin

commit bb1235ac87f86e3053e558794eeca978786029cd
Author: GJ
Date:   2013-03-01 17:13:24 -0500

Javadoc updates