Javadoc updates
Merge #4



commit 58c27accd1140d6a05fe3ef824a609139119fcaa
Author: GJ
Date:   2013-03-01 17:54:33 -0500

Javadoc updates